diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2018-06-19 17:12:09 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-25 01:10:48 +0200 |
| commit | b34ed105d5eead1cb7657d0a8fc23a524cf28d31 (patch) | |
| tree | 311461200e537fb1d063e90dbf2a1fa118e957bd /sw | |
| parent | baf3cec77db5f03200c038101e77720fae2ffba3 (diff) | |
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: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/config/optload.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/cption.hxx | 12 | ||||
| -rw-r--r-- | sw/source/uibase/inc/optload.hxx | 15 |
3 files changed, 17 insertions, 12 deletions
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 11525600f450..dc05b9f35417 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -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"); diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index 3942fe4e0293..037debb11369 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -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 { diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index fb84a7b5ff2d..ef6f828b67e9 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -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); |