2 files changed, 24 insertions, 46 deletions

diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx
index b6c83f14e5c1..fc4c48890805 100644
--- a/sw/source/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/uibase/inc/numberingtypelistbox.hxx
@@ -41,23 +41,6 @@ namespace o3tl {
 
 struct SwNumberingTypeListBox_Impl;
 
-class SW_DLLPUBLIC SwNumberingTypeListBox : public ListBox
-{
-    std::unique_ptr<SwNumberingTypeListBox_Impl> pImpl;
-
-public:
-    SwNumberingTypeListBox( vcl::Window* pWin, WinBits nStyle );
-    virtual ~SwNumberingTypeListBox() override;
-    virtual void dispose() override;
-
-    virtual bool set_property(const OString &rKey, const OUString &rValue) override;
-
-    void          Reload(SwInsertNumTypes nTypeFlags);
-
-    SvxNumType    GetSelectedNumberingType();
-    bool          SelectNumberingType(SvxNumType nType);
-};
-
 class SW_DLLPUBLIC NumberingTypeListBox
 {
     std::unique_ptr<weld::ComboBoxText> m_xWidget;
@@ -73,6 +56,7 @@ public:
     SvxNumType    GetSelectedNumberingType();
     bool          SelectNumberingType(SvxNumType nType);
     void          SetNoSelection() { m_xWidget->set_active(-1); }
+    void          Enable(bool bEnable) { m_xWidget->set_sensitive(bEnable); }
 };
 
 #endif
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 83480447d891..df0642a2e140 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -191,39 +191,33 @@ public:
 
 class SwSectionFootnoteEndTabPage : public SfxTabPage
 {
-    VclPtr<CheckBox>        m_pFootnoteNtAtTextEndCB;
-
-    VclPtr<CheckBox>        m_pFootnoteNtNumCB;
-    VclPtr<FixedText>       m_pFootnoteOffsetLbl;
-    VclPtr<NumericField>    m_pFootnoteOffsetField;
-
-    VclPtr<CheckBox>        m_pFootnoteNtNumFormatCB;
-    VclPtr<FixedText>       m_pFootnotePrefixFT;
-    VclPtr<Edit>            m_pFootnotePrefixED;
-    VclPtr<SwNumberingTypeListBox> m_pFootnoteNumViewBox;
-    VclPtr<FixedText>       m_pFootnoteSuffixFT;
-    VclPtr<Edit>            m_pFootnoteSuffixED;
-
-    VclPtr<CheckBox>        m_pEndNtAtTextEndCB;
-
-    VclPtr<CheckBox>        m_pEndNtNumCB;
-    VclPtr<FixedText>       m_pEndOffsetLbl;
-    VclPtr<NumericField>    m_pEndOffsetField;
-
-    VclPtr<CheckBox>        m_pEndNtNumFormatCB;
-    VclPtr<FixedText>       m_pEndPrefixFT;
-    VclPtr<Edit>            m_pEndPrefixED;
-    VclPtr<SwNumberingTypeListBox> m_pEndNumViewBox;
-    VclPtr<FixedText>       m_pEndSuffixFT;
-    VclPtr<Edit>            m_pEndSuffixED;
-
-    DECL_LINK( FootEndHdl, Button*, void );
+    std::unique_ptr<weld::CheckButton> m_xFootnoteNtAtTextEndCB;
+    std::unique_ptr<weld::CheckButton> m_xFootnoteNtNumCB;
+    std::unique_ptr<weld::Label> m_xFootnoteOffsetLbl;
+    std::unique_ptr<weld::SpinButton> m_xFootnoteOffsetField;
+    std::unique_ptr<weld::CheckButton> m_xFootnoteNtNumFormatCB;
+    std::unique_ptr<weld::Label> m_xFootnotePrefixFT;
+    std::unique_ptr<weld::Entry> m_xFootnotePrefixED;
+    std::unique_ptr<NumberingTypeListBox> m_xFootnoteNumViewBox;
+    std::unique_ptr<weld::Label> m_xFootnoteSuffixFT;
+    std::unique_ptr<weld::Entry> m_xFootnoteSuffixED;
+    std::unique_ptr<weld::CheckButton> m_xEndNtAtTextEndCB;
+    std::unique_ptr<weld::CheckButton> m_xEndNtNumCB;
+    std::unique_ptr<weld::Label> m_xEndOffsetLbl;
+    std::unique_ptr<weld::SpinButton> m_xEndOffsetField;
+    std::unique_ptr<weld::CheckButton> m_xEndNtNumFormatCB;
+    std::unique_ptr<weld::Label> m_xEndPrefixFT;
+    std::unique_ptr<weld::Entry> m_xEndPrefixED;
+    std::unique_ptr<NumberingTypeListBox> m_xEndNumViewBox;
+    std::unique_ptr<weld::Label> m_xEndSuffixFT;
+    std::unique_ptr<weld::Entry> m_xEndSuffixED;
+
+    DECL_LINK(FootEndHdl, weld::ToggleButton&, void);
     void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& );
 
 public:
-    SwSectionFootnoteEndTabPage( vcl::Window *pParent, const SfxItemSet &rAttrSet );
+    SwSectionFootnoteEndTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
     virtual ~SwSectionFootnoteEndTabPage() override;
-    virtual void dispose() override;
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
     virtual void        Reset( const SfxItemSet* ) override;