sw/source/ui/config/optload.cxx | 2 ++ sw/source/uibase/inc/cption.hxx | 12 ------------ sw/source/uibase/inc/optload.hxx | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-)
New commits: commit fa2e9cd1cb9a37028c4a1107b6a58e1ac701993b Author: Xisco Fauli <[email protected]> Date: Tue Jun 19 17:12:09 2018 +0200 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 <[email protected]> (cherry picked from commit b34ed105d5eead1cb7657d0a8fc23a524cf28d31) Reviewed-on: https://gerrit.libreoffice.org/56374 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index fc16a924ea11..19da228727e9 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -463,12 +463,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 ded6d36b9dc8..a9a877da3736 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 5b98e6508463..d97ba7d96abd 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: @@ -172,6 +185,8 @@ private: SwFieldMgr* pMgr; bool bHTMLMode; + TextFilterAutoConvert m_aTextFilter; + DECL_LINK(SelectHdl, ComboBox&, void); DECL_LINK(SelectListBoxHdl, ListBox&, void); DECL_LINK(ModifyHdl, Edit&, void); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
