[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/source

[Serge Krot (via logerrit)]

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

New commits:
commit 91bb6196ab7b174fa02acbc1852739cf76439d3e
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: Fri May 17 20:09:53 2019 +0200

    tdf#124829 sc: fix crash during progress update
    
    Call reschedule() during update of the cells height is not
    thread safe.
    
    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>
    Reviewed-on: https://gerrit.libreoffice.org/72236
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5f410088767e05ef5b5a7a7d5bebdce899cfe86a)
    
    Conflicts:
            sc/source/core/data/table1.cxx
    
    Change-Id: Ia938aead79a048f12a53aa55c034e84ce3bf433b
    Reviewed-on: https://gerrit.libreoffice.org/72498
    Reviewed-by: Serge Krot (CIB) <Serge.Krot at cib.de>
    Tested-by: Serge Krot (CIB) <Serge.Krot at cib.de>
    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 bd4e779d0984..409968693df5 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -107,7 +107,6 @@ void GetOptimalHeightsInColumn(
     const SCROW nMinStart = nStartRow + nPos;
 
     sal_uLong nWeightedCount = nProgressStart + rCol[MAXCOL].GetWeightedCount(nStartRow, nEndRow);
-    const SCCOL progressUpdateStep = MAXCOL / 10;
     for (SCCOL nCol=0; nCol<MAXCOL; nCol++)     // MAXCOL already above
     {
         rCol[nCol].GetOptimalHeight(rCxt, nStartRow, nEndRow, nMinHeight, nMinStart);
@@ -116,12 +115,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);
-            }
         }
     }
 }