[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/svx sc/source svx/source

[Caolán McNamara (via logerrit)]

 include/svx/ctredlin.hxx           |    1 +
 sc/source/ui/miscdlgs/acredlin.cxx |    2 +-
 svx/source/dialog/ctredlin.cxx     |    7 +++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 418c1d6143dd42e48ef52e0fb8c3d6e5d22c3cfa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jun 2 15:52:28 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 3 22:15:54 2019 +0200

    Resolves: tdf#125589 we are initially unsorted
    
    so turn on sorting on first sort request
    
    Change-Id: I897f64c0695be8cca6d93e234a7d7c4718c94f78
    Reviewed-on: https://gerrit.libreoffice.org/73345
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index b6ae656d586f..16147e60bd08 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -92,6 +92,7 @@ private:
     bool            bAuthor;
     bool            bDate;
     bool            bComment;
+    bool            bSorted;
     SvxRedlinDateMode nDaTiMode;
     DateTime        aDaTiFirst;
     DateTime        aDaTiLast;
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index c04fa55f0b85..44d89d2669be 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1748,7 +1748,7 @@ int ScAcceptChgDlg::ColCompareHdl(const weld::TreeIter& rLeft, const weld::TreeI
     weld::TreeView& rTreeView = pTheView->GetWidget();
 
     sal_Int32 nCompare = 0;
-    SCCOL nSortCol= rTreeView.get_sort_column();
+    SCCOL nSortCol = rTreeView.get_sort_column();
 
     if (CALC_DATE == nSortCol)
     {
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 22595f923e2a..9cdfe60d40d5 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -83,6 +83,7 @@ SvxRedlinTable::SvxRedlinTable(std::unique_ptr<weld::TreeView> xWriterControl,
     , bAuthor(false)
     , bDate(false)
     , bComment(false)
+    , bSorted(false)
     , nDaTiMode(SvxRedlinDateMode::BEFORE)
     , aDaTiFirst( DateTime::EMPTY )
     , aDaTiLast( DateTime::EMPTY )
@@ -121,6 +122,12 @@ SvxRedlinTable::~SvxRedlinTable()
 
 IMPL_LINK(SvxRedlinTable, HeaderBarClick, int, nColumn, void)
 {
+    if (!bSorted)
+    {
+        pTreeView->make_sorted();
+        bSorted = true;
+    }
+
     bool bSortAtoZ = pTreeView->get_sort_order();
 
     //set new arrow positions in headerbar