Kaydet (Commit) b34ed105 authored tarafından Xisco Fauli's avatar Xisco Fauli Kaydeden (comit) Thorsten Behrens

tdf#118240 Filter category in Autocaption as done in insert caption

Change-Id: I138a47419a7c18f59ecc1e0935b669546fcee6e6
Reviewed-on: https://gerrit.libreoffice.org/56115
Tested-by: Jenkins
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst baf3cec7
......@@ -462,12 +462,14 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
, m_sNone(SwResId(SW_STR_NONE))
, pMgr(new SwFieldMgr())
, bHTMLMode(false)
, m_aTextFilter(m_sNone)
{
get(m_pCheckLB, "objects");
get(m_pLbCaptionOrder, "captionorder");
get(m_pPreview, "preview");
get(m_pSettingsGroup, "settings");
get(m_pCategoryBox, "category");
m_pCategoryBox->SetTextFilter(&m_aTextFilter);
get(m_pFormatText, "numberingft");
get(m_pFormatBox, "numbering");
get(m_pNumberingSeparatorFT, "numseparatorft");
......
......@@ -35,18 +35,6 @@
class SwFieldMgr;
class SwView;
class TextFilterAutoConvert : public TextFilter
{
private:
OUString m_sLastGoodText;
OUString m_sNone;
public:
TextFilterAutoConvert(const OUString &rNone)
: m_sNone(rNone)
{
}
virtual OUString filter(const OUString &rText) override;
};
class SwCaptionDialog : public SvxStandardDialog
{
......
......@@ -43,6 +43,19 @@ public:
static FieldUnit GetValue(sal_uInt32 i);
};
class TextFilterAutoConvert : public TextFilter
{
private:
OUString m_sLastGoodText;
OUString m_sNone;
public:
TextFilterAutoConvert(const OUString &rNone)
: m_sNone(rNone)
{
}
virtual OUString filter(const OUString &rText) override;
};
class SwLoadOptPage : public SfxTabPage
{
private:
......@@ -170,6 +183,8 @@ private:
SwFieldMgr* pMgr;
bool bHTMLMode;
TextFilterAutoConvert m_aTextFilter;
DECL_LINK(SelectHdl, ComboBox&, void);
DECL_LINK(SelectListBoxHdl, ListBox&, void);
DECL_LINK(ModifyHdl, Edit&, void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment