weld SvxCharTwoLinesPage

Change-Id: I54a8963cd8b12f5fd51bf6b3bb791a4a15fbd13d
Reviewed-on: https://gerrit.libreoffice.org/55762
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, 11 insertions, 12 deletions

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 144b13e94513..37b8dae50a99 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -327,32 +327,31 @@ public:
 
 // class SvxCharTwoLinesPage ---------------------------------------------
 
-class SvxCharTwoLinesPage : public SvxCharBasePage
+class SvxCharTwoLinesPage : public CharBasePage
 {
     friend class VclPtr<SvxCharTwoLinesPage>;
 private:
     static const sal_uInt16 pTwoLinesRanges[];
-    VclPtr<CheckBox>           m_pTwoLinesBtn;
-    VclPtr<VclContainer>       m_pEnclosingFrame;
-    VclPtr<ListBox>            m_pStartBracketLB;
-    VclPtr<ListBox>            m_pEndBracketLB;
-
     sal_uInt16              m_nStartBracketPosition;
     sal_uInt16              m_nEndBracketPosition;
 
-    SvxCharTwoLinesPage(vcl::Window* pParent, const SfxItemSet& rSet);
+    std::unique_ptr<weld::CheckButton>  m_xTwoLinesBtn;
+    std::unique_ptr<weld::Widget> m_xEnclosingFrame;
+    std::unique_ptr<weld::TreeView> m_xStartBracketLB;
+    std::unique_ptr<weld::TreeView> m_xEndBracketLB;
+
+    SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet);
 
     void                UpdatePreview_Impl();
     void                Initialize();
-    void                SelectCharacter( ListBox* pBox );
-    void                SetBracket( sal_Unicode cBracket, bool bStart );
+    void                SelectCharacter(weld::TreeView* pBox);
+    void                SetBracket(sal_Unicode cBracket, bool bStart);
 
-    DECL_LINK(TwoLinesHdl_Impl, Button*, void);
-    DECL_LINK(CharacterMapHdl_Impl, ListBox&, void );
+    DECL_LINK(TwoLinesHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void);
 
 public:
     virtual ~SvxCharTwoLinesPage() override;
-    virtual void dispose() override;
 
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;