[Libreoffice-commits] core.git: include/svx sw/source

[Caolán McNamara (via logerrit)]

 include/svx/ctredlin.hxx           |    1 +
 sw/source/uibase/misc/redlndlg.cxx |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit dd8313d2c65f0cea68b1ab2aeefb1426b1d3b76c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 31 11:47:49 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Sep 1 09:39:08 2020 +0200

    Resolves: tdf#136189 don't try and sort until treeview is filled
    
    Change-Id: Ic5ac71d88bab7627e14220912f4b9c935f2f1f26
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101709
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index b7d0f80ada23..1b4dac85319b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -104,6 +104,7 @@ public:
     void set_size_request(int nWidth, int nHeight);
 
     weld::TreeView& GetWidget() { return *pTreeView; }
+    bool IsSorted() const { return bSorted; }
 
     ~SvxRedlinTable();
 
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 4f242e273af6..0d21ad65554c 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -717,6 +717,8 @@ void SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
         pCurrRedline = nullptr;
 
     rTreeView.freeze();
+    if (m_pTable->IsSorted())
+        rTreeView.make_unsorted();
     for (SwRedlineTable::size_type i = nStart; i <= nEnd; i++)
     {
         const SwRangeRedline& rRedln = pSh->GetRedline(i);
@@ -763,6 +765,8 @@ void SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
         InsertChildren(pRedlineParent, rRedln, bHasRedlineAutoFormat);
     }
     rTreeView.thaw();
+    if (m_pTable->IsSorted())
+        rTreeView.make_sorted();
 }
 
 void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )