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

[Caolán McNamara (via logerrit)]

 sc/source/ui/dbgui/tpsort.cxx |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 39f08d04047fba6fef9972f8b2ab4cd5658870ea
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jan 23 11:27:17 2020 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jan 24 15:22:09 2020 +0100

    Resolves: tdf#129158 freeze/thaw around bulk inserts
    
    Change-Id: I0ba22cd262512b467abd383d2f932d2adf6ca1a5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87257
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 13c2785953c2..2e7ed6e3af8d 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -320,10 +320,11 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
 
         if ( pDoc )
         {
-            for ( sal_uInt16 i=nStartField; i<nSortKeyCount; i++ )
+            for (sal_uInt16 j = nStartField; j < nSortKeyCount; ++j)
             {
-                m_aSortWin.m_aSortKeyItems[i]->m_xLbSort->clear();
-                m_aSortWin.m_aSortKeyItems[i]->m_xLbSort->append_text(aStrUndefined);
+                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->clear();
+                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->freeze();
+                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->append_text(aStrUndefined);
             }
 
             SCCOL   nFirstSortCol   = aSortData.nCol1;
@@ -375,6 +376,12 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
                     i++;
                 }
             }
+
+            for (sal_uInt16 j=nStartField; j < nSortKeyCount; ++j)
+            {
+                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->thaw();
+            }
+
             nFieldCount = i;
         }
     }