tdf#161811 Changes in TC manager dialog should be in order of

appearance in document

Adds a drop down control to the Writer Manage Changes dialog/sidebar
panel that can be used to select how the changes list is sorted.

Change-Id: I9602322ec61ae6e15a08fbc26aa69de1b64294e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170390
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index f852a4886bd7..c098efa6a11b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -83,6 +83,8 @@ private:
     std::unique_ptr<weld::TreeView> xCalcTreeView;
     weld::TreeView* pTreeView;
 
+    weld::ComboBox* m_pSortByComboBox;
+
     sal_uInt16      nDatePos;
     bool            bAuthor;
     bool            bDate;
@@ -100,7 +102,8 @@ private:
 
 public:
     SvxRedlinTable(std::unique_ptr<weld::TreeView> xWriterControl,
-                   std::unique_ptr<weld::TreeView> xCalcControl);
+                   std::unique_ptr<weld::TreeView> xCalcControl,
+                   weld::ComboBox* pSortByControl);
 
     weld::TreeView& GetWidget() { return *pTreeView; }
     bool IsSorted() const { return bSorted; }
@@ -256,13 +259,14 @@ public:
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPView final : public SvxTPage
 {
 private:
-
     Link<SvxTPView*,void>          AcceptClickLk;
     Link<SvxTPView*,void>          AcceptAllClickLk;
     Link<SvxTPView*,void>          RejectClickLk;
     Link<SvxTPView*,void>          RejectAllClickLk;
     Link<SvxTPView*,void>          UndoClickLk;
 
+    Link<SvxTPView*,void> SortByComboBoxChangedLk;
+
     bool bEnableAccept;
     bool bEnableAcceptAll;
     bool bEnableReject;
@@ -277,9 +281,11 @@ private:
     std::unique_ptr<weld::Button> m_xAcceptAll;
     std::unique_ptr<weld::Button> m_xRejectAll;
     std::unique_ptr<weld::Button> m_xUndo;
+    std::unique_ptr<weld::ComboBox> m_xSortByComboBox;
     std::unique_ptr<SvxRedlinTable> m_xViewData;
 
     DECL_DLLPRIVATE_LINK( PbClickHdl, weld::Button&, void );
+    DECL_DLLPRIVATE_LINK(SortByComboBoxChangedHdl, weld::ComboBox&, void);
 
 public:
     SvxTPView(weld::Container* pParent);
@@ -287,6 +293,8 @@ public:
 
     SvxRedlinTable* GetTableControl() { return m_xViewData.get(); }
 
+    weld::ComboBox* GetSortByComboBoxControl() { return m_xSortByComboBox.get(); }
+
     void            EnableAccept(bool bFlag);
     void            EnableAcceptAll(bool bFlag);
     void            EnableReject(bool bFlag);
@@ -307,6 +315,11 @@ public:
 
     void            SetUndoClickHdl( const Link<SvxTPView*,void>& rLink ) { UndoClickLk = rLink; }
 
+    void SetSortByComboBoxChangedHdl(const Link<SvxTPView*, void>& rLink)
+    {
+        SortByComboBoxChangedLk = rLink;
+    }
+
     virtual void    ActivatePage() override;
     void            DeactivatePage();
 };