weld SvxExtParagraphTabPage

Change-Id: I6836bc659f28ebae35ed0ca33ffd9425212c3622
Reviewed-on: https://gerrit.libreoffice.org/55784
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 40 insertions, 42 deletions

diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 648394ae4690..569f5c082b23 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -202,7 +202,6 @@ class SvxExtParagraphTabPage: public SfxTabPage
 
 public:
     virtual ~SvxExtParagraphTabPage() override;
-    virtual void dispose() override;
 
     static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rSet );
@@ -218,59 +217,58 @@ protected:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 private:
-                        SvxExtParagraphTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
+    SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+
+    bool                bPageBreak;
+    bool                bHtmlMode;
+    sal_uInt16          nStdPos;
 
     // hyphenation
-    VclPtr<TriStateBox>        m_pHyphenBox;
-    VclPtr<FixedText>          m_pBeforeText;
-    VclPtr<NumericField>       m_pExtHyphenBeforeBox;
-    VclPtr<FixedText>          m_pAfterText;
-    VclPtr<NumericField>       m_pExtHyphenAfterBox;
-    VclPtr<FixedText>          m_pMaxHyphenLabel;
-    VclPtr<NumericField>       m_pMaxHyphenEdit;
+    std::unique_ptr<weld::CheckButton> m_xHyphenBox;
+    std::unique_ptr<weld::Label> m_xBeforeText;
+    std::unique_ptr<weld::SpinButton> m_xExtHyphenBeforeBox;
+    std::unique_ptr<weld::Label> m_xAfterText;
+    std::unique_ptr<weld::SpinButton> m_xExtHyphenAfterBox;
+    std::unique_ptr<weld::Label> m_xMaxHyphenLabel;
+    std::unique_ptr<weld::SpinButton> m_xMaxHyphenEdit;
 
     // pagebreak
-    VclPtr<TriStateBox>        m_pPageBreakBox;
-    VclPtr<FixedText>          m_pBreakTypeFT;
-    VclPtr<ListBox>            m_pBreakTypeLB;
-    VclPtr<FixedText>          m_pBreakPositionFT;
-    VclPtr<ListBox>            m_pBreakPositionLB;
-    VclPtr<TriStateBox>        m_pApplyCollBtn;
-    VclPtr<ListBox>            m_pApplyCollBox;
-    VclPtr<TriStateBox>        m_pPageNumBox;
-    VclPtr<NumericField>       m_pPagenumEdit;
+    std::unique_ptr<weld::CheckButton> m_xPageBreakBox;
+    std::unique_ptr<weld::Label> m_xBreakTypeFT;
+    std::unique_ptr<weld::ComboBoxText> m_xBreakTypeLB;
+    std::unique_ptr<weld::Label> m_xBreakPositionFT;
+    std::unique_ptr<weld::ComboBoxText> m_xBreakPositionLB;
+    std::unique_ptr<weld::CheckButton> m_xApplyCollBtn;
+    std::unique_ptr<weld::ComboBoxText> m_xApplyCollBox;
+    std::unique_ptr<weld::CheckButton> m_xPageNumBox;
+    std::unique_ptr<weld::SpinButton> m_xPagenumEdit;
 
     // paragraph division
-    VclPtr<TriStateBox>        m_pKeepTogetherBox;
-    VclPtr<TriStateBox>        m_pKeepParaBox;
+    std::unique_ptr<weld::CheckButton> m_xKeepTogetherBox;
+    std::unique_ptr<weld::CheckButton> m_xKeepParaBox;
 
     // orphan/widow
-    VclPtr<TriStateBox>        m_pOrphanBox;
-    VclPtr<NumericField>       m_pOrphanRowNo;
-    VclPtr<FixedText>          m_pOrphanRowLabel;
-
-    VclPtr<TriStateBox>        m_pWidowBox;
-    VclPtr<NumericField>       m_pWidowRowNo;
-    VclPtr<FixedText>          m_pWidowRowLabel;
-
-    bool                bPageBreak;
-    bool                bHtmlMode;
-    sal_uInt16              nStdPos;
-
-    DECL_LINK(PageBreakHdl_Impl, Button*, void);
-    DECL_LINK(KeepTogetherHdl_Impl, Button*, void);
-    DECL_LINK(WidowHdl_Impl, Button*, void);
-    DECL_LINK(OrphanHdl_Impl, Button*, void);
-    DECL_LINK(HyphenClickHdl_Impl, Button*, void);
-    DECL_LINK(ApplyCollClickHdl_Impl, Button*, void);
-    DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void );
-    DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void );
-    DECL_LINK(PageNumBoxClickHdl_Impl, Button*, void);
+    std::unique_ptr<weld::CheckButton> m_xOrphanBox;
+    std::unique_ptr<weld::SpinButton> m_xOrphanRowNo;
+    std::unique_ptr<weld::Label> m_xOrphanRowLabel;
+
+    std::unique_ptr<weld::CheckButton> m_xWidowBox;
+    std::unique_ptr<weld::SpinButton> m_xWidowRowNo;
+    std::unique_ptr<weld::Label> m_xWidowRowLabel;
+
+    DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(KeepTogetherHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(WidowHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(OrphanHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(HyphenClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBoxText&, void);
+    DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBoxText&, void);
+    DECL_LINK(PageNumBoxClickHdl_Impl, weld::ToggleButton&, void);
 
     virtual void            PageCreated(const SfxAllItemSet& aSet) override;
 };
 
-
 class SvxAsianTabPage : public SfxTabPage
 {
     friend class VclPtr<SvxAsianTabPage>;