Resolves tdf#131155 - Keep frequently used options on sort criteria tab

* Row/Column header moved
* Sort by row/column moved
* Extra variables removed
* UI tests adjusted to read/set sort direction and header from first tab

Change-Id: I9fc0406806256f289d52e45b096e392067768eaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130843
Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>

1 files changed, 8 insertions, 9 deletions

diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 39043e0cc0a2..655f3a7732ed 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -61,6 +61,8 @@ private:
     OUString            aStrUndefined;
     OUString            aStrColumn;
     OUString            aStrRow;
+    OUString            aStrRowLabel;
+    OUString            aStrColLabel;
 
     TypedWhichId<ScSortItem> nWhichSort;
     ScViewData*         pViewData;
@@ -69,9 +71,10 @@ private:
     sal_uInt16          nFieldCount;
     sal_uInt16          nSortKeyCount;
 
-    bool                bHasHeader;
-    bool                bSortByRows;
-
+    std::unique_ptr<weld::Container> m_xTop;
+    std::unique_ptr<weld::CheckButton> m_xBtnHeader;
+    std::unique_ptr<weld::RadioButton> m_xBtnTopDown;
+    std::unique_ptr<weld::RadioButton> m_xBtnLeftRight;
     std::unique_ptr<weld::ScrolledWindow> m_xScrolledWindow;
     std::unique_ptr<weld::Container> m_xBox;
     ScSortKeyWindow m_aSortWin;
@@ -87,6 +90,8 @@ private:
     // Handler ------------------------
     DECL_LINK(SelectHdl, weld::ComboBox&, void);
     DECL_LINK(ScrollToEndHdl, Timer*, void);
+    DECL_LINK(SortDirHdl, weld::Toggleable&, void);
+
 };
 
 // Sort Options
@@ -107,8 +112,6 @@ protected:
     virtual DeactivateRC   DeactivatePage  ( SfxItemSet* pSet ) override;
 
 private:
-    OUString            aStrRowLabel;
-    OUString            aStrColLabel;
     OUString            aStrUndefined;
 
     TypedWhichId<ScSortItem> nWhichSort;
@@ -121,7 +124,6 @@ private:
     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;
@@ -132,8 +134,6 @@ private:
     std::unique_ptr<SvxLanguageBox> m_xLbLanguage;
     std::unique_ptr<weld::Label> m_xFtAlgorithm;
     std::unique_ptr<weld::ComboBox> 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;
 
@@ -145,7 +145,6 @@ private:
     DECL_LINK( EnableHdl, weld::Toggleable&, void );
     DECL_LINK( SelOutPosHdl, weld::ComboBox&, void );
     void EdOutPosModHdl();
-    DECL_LINK( SortDirHdl, weld::Toggleable&, void );
     void FillAlgor();
     DECL_LINK( FillAlgorHdl, weld::ComboBox&, void );
 };