weld ScSortDlg, ScTabPageSortOptions and ScTabPageSortFields

Change-Id: I103e5e3670f8c95c1f480ce0c36e08c3de74e900
Reviewed-on: https://gerrit.libreoffice.org/54541
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, 38 insertions, 50 deletions

diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 660d9eb3141f..469087353e0e 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -46,19 +46,14 @@ struct ScSortParam;
 class ScTabPageSortFields : public SfxTabPage
 {
 public:
-    ScTabPageSortFields( vcl::Window*             pParent,
-            const SfxItemSet&   rArgSet );
+    ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet);
+    virtual void dispose() override;
     virtual ~ScTabPageSortFields() override;
-    virtual void        dispose() override;
     static  VclPtr<SfxTabPage> Create      ( TabPageParent               pParent,
                                       const SfxItemSet*     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) override;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) override;
 
-    virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) override;
-    virtual void SetSizePixel(const Size& rAllocation) override;
-    virtual void SetPosPixel(const Point& rAllocPos) override;
-
 protected:
     virtual void        ActivatePage    ( const SfxItemSet& rSet ) override;
     using SfxTabPage::ActivatePage;
@@ -66,12 +61,13 @@ protected:
     virtual DeactivateRC   DeactivatePage  ( SfxItemSet* pSet ) override;
 
 private:
+    Idle m_aIdle;
+
     OUString            aStrUndefined;
     OUString            aStrColumn;
     OUString            aStrRow;
 
     const sal_uInt16    nWhichSort;
-    VclPtr<ScSortDlg>   pDlg;
     ScViewData*         pViewData;
     ScSortParam         aSortData;
     std::vector<SCCOLROW>  nFieldArr;
@@ -81,8 +77,11 @@ private:
     bool                bHasHeader;
     bool                bSortByRows;
 
-    ScSortKeyItems      maSortKeyItems;
-    ScSortKeyCtrl       maSortKeyCtrl;
+    std::unique_ptr<weld::ScrolledWindow> m_xScrolledWindow;
+    std::unique_ptr<weld::Container> m_xBox;
+    ScSortKeyWindow m_aSortWin;
+
+    void AddSortKey( sal_uInt16 nItem );
 
 private:
     void    Init            ();
@@ -91,7 +90,8 @@ private:
     void    SetLastSortKey( sal_uInt16 nItem );
 
     // Handler ------------------------
-    DECL_LINK( SelectHdl, ListBox&, void );
+    DECL_LINK(SelectHdl, weld::ComboBoxText&, void);
+    DECL_LINK(ScrollToEndHdl, Timer*, void);
 };
 
 // Sort Options
@@ -103,15 +103,9 @@ class CollatorWrapper;
 class ScTabPageSortOptions : public SfxTabPage
 {
 public:
-    ScTabPageSortOptions( vcl::Window*            pParent,
-            const SfxItemSet&  rArgSet );
-    virtual ~ScTabPageSortOptions() override;
-    virtual void dispose() override;
+    ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
 
-#undef SfxTabPage
-#define SfxTabPage ::SfxTabPage
-    static  VclPtr<SfxTabPage> Create      ( TabPageParent               pParent,
-                                      const SfxItemSet*     rArgSet );
+    static  VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet);
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) override;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) override;
 
@@ -122,29 +116,6 @@ protected:
     virtual DeactivateRC   DeactivatePage  ( SfxItemSet* pSet ) override;
 
 private:
-
-    VclPtr<CheckBox>           m_pBtnCase;
-    VclPtr<CheckBox>           m_pBtnHeader;
-    VclPtr<CheckBox>           m_pBtnFormats;
-    VclPtr<CheckBox>           m_pBtnNaturalSort;
-
-    VclPtr<CheckBox>           m_pBtnCopyResult;
-    VclPtr<ListBox>            m_pLbOutPos;
-    VclPtr<Edit>               m_pEdOutPos;
-
-    VclPtr<CheckBox>           m_pBtnSortUser;
-    VclPtr<ListBox>            m_pLbSortUser;
-
-    VclPtr<SvxLanguageBox>     m_pLbLanguage;
-    VclPtr<FixedText>          m_pFtAlgorithm;
-    VclPtr<ListBox>            m_pLbAlgorithm;
-
-    VclPtr<RadioButton>        m_pBtnTopDown;
-    VclPtr<RadioButton>        m_pBtnLeftRight;
-
-    VclPtr<CheckBox>           m_pBtnIncComments;
-    VclPtr<CheckBox>           m_pBtnIncImages;
-
     OUString            aStrRowLabel;
     OUString            aStrColLabel;
     OUString            aStrUndefined;
@@ -153,22 +124,39 @@ private:
     ScSortParam         aSortData;
     ScViewData*         pViewData;
     ScDocument*         pDoc;
-    VclPtr<ScSortDlg>          pDlg;
     ScAddress           theOutPos;
 
-    CollatorResource*  pColRes;
-    CollatorWrapper*    pColWrap;
+    std::unique_ptr<CollatorResource>  m_xColRes;
+    std::unique_ptr<CollatorWrapper>   m_xColWrap;
+
+    std::unique_ptr<weld::CheckButton> m_xBtnCase;
+    std::unique_ptr<weld::CheckButton> m_xBtnHeader;
+    std::unique_ptr<weld::CheckButton> m_xBtnFormats;
+    std::unique_ptr<weld::CheckButton> m_xBtnNaturalSort;
+    std::unique_ptr<weld::CheckButton> m_xBtnCopyResult;
+    std::unique_ptr<weld::ComboBoxText> m_xLbOutPos;
+    std::unique_ptr<weld::Entry> m_xEdOutPos;
+    std::unique_ptr<weld::CheckButton> m_xBtnSortUser;
+    std::unique_ptr<weld::ComboBoxText> m_xLbSortUser;
+    std::unique_ptr<LanguageBox> m_xLbLanguage;
+    std::unique_ptr<weld::Label> m_xFtAlgorithm;
+    std::unique_ptr<weld::ComboBoxText> m_xLbAlgorithm;
+    std::unique_ptr<weld::RadioButton> m_xBtnTopDown;
+    std::unique_ptr<weld::RadioButton> m_xBtnLeftRight;
+    std::unique_ptr<weld::CheckButton> m_xBtnIncComments;
+    std::unique_ptr<weld::CheckButton> m_xBtnIncImages;
 
 private:
     void Init                   ();
     void FillUserSortListBox    ();
 
     // Handler ------------------------
-    DECL_LINK( EnableHdl, Button*, void );
-    DECL_LINK( SelOutPosHdl, ListBox&, void );
-    void EdOutPosModHdl ( Edit* pEd );
-    DECL_LINK( SortDirHdl, Button *, void );
-    DECL_LINK( FillAlgorHdl, ListBox&, void );
+    DECL_LINK( EnableHdl, weld::ToggleButton&, void );
+    DECL_LINK( SelOutPosHdl, weld::ComboBoxText&, void );
+    void EdOutPosModHdl();
+    DECL_LINK( SortDirHdl, weld::ToggleButton&, void );
+    void FillAlgor();
+    DECL_LINK( FillAlgorHdl, weld::ComboBoxText&, void );
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_TPSORT_HXX