diff options
| author | Serge Krot <Serge.Krot@cib.de> | 2019-05-07 10:10:33 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-05-17 20:09:53 +0200 |
| commit | 91bb6196ab7b174fa02acbc1852739cf76439d3e (patch) | |
| tree | ef6e00b4f8d675fd8069fc16138d928c5dcd64b2 /sc | |
| parent | 249f6cd9bf764116aa0acfaa092ad8af7d59e52f (diff) | |
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@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/72236
Tested-by: Thorsten Behrens <Thorsten.Behrens@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@cib.de>
Tested-by: Serge Krot (CIB) <Serge.Krot@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/table1.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
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); - } } } } |