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

[Serge Krot (via logerrit)]

 sc/source/core/data/table1.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit f937948f09c4d1346fa2e4428a1d8e0c6da0b7f7
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Tue May 7 10:10:33 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed May 8 11:47:42 2019 +0200

    tdf#124829 sc: fix crash during progress update
    
    Call reschedule() during update of the cells height is not
    thread safe.
    
    Change-Id: Ia938aead79a048f12a53aa55c034e84ce3bf433b
    Reviewed-on: https://gerrit.libreoffice.org/71892
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/71908
    (cherry picked from commit 4d76f6232289f6a875b30a4cc7dec1226ffb70cb)
    Reviewed-on: https://gerrit.libreoffice.org/71914
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 9377c7111a6e..324fcc5284c2 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -109,7 +109,6 @@ void GetOptimalHeightsInColumn(
 
     sal_uLong nWeightedCount = nProgressStart + rCol.back().GetWeightedCount(nStartRow, nEndRow);
     const SCCOL maxCol = (rCol.size() - 1); // last col done already above
-    const SCCOL progressUpdateStep = rCol.size() / 10;
     for (SCCOL nCol=0; nCol<maxCol; nCol++)
     {
         rCol[nCol].GetOptimalHeight(rCxt, nStartRow, nEndRow, nMinHeight, nMinStart);
@@ -118,12 +117,6 @@ void GetOptimalHeightsInColumn(
         {
             nWeightedCount += rCol[nCol].GetWeightedCount(nStartRow, nEndRow);
             pProgress->SetState( nWeightedCount );
-
-            if ((nCol % progressUpdateStep) == 0)
-            {
-                // try to make sure the progress dialog is painted before continuing
-                Application::Reschedule(true);
-            }
         }
     }
 }