[Libreoffice-commits] core.git: sc/source

Serge Krot (via logerrit) logerrit at kemper.freedesktop.org
Tue May 7 09:45:51 UTC 2019


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

New commits:
commit 78a1fd8e1d48f9cbc71b35b1c27379c6152667cc
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Tue May 7 10:10:33 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue May 7 11:45:15 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>

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 2e7a7ffc33cc..24d0439935ea 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);
-            }
         }
     }
 }


More information about the Libreoffice-commits mailing list