diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2020-08-27 19:02:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-08-29 08:27:35 +0200 |
commit | 3905cb1b2c723617298dd525cf18669f3ca5720b (patch) | |
tree | 835f7734cae79f6d5f5c4d61a21b4fe01a325a0e /sc | |
parent | 6aff5d2e913bebe858ced534ef059166683c7d6a (diff) |
tdf#136113 shape editing does not change modified status
regression from
commit edf13fe1247e7ef411a9ff5435385573fad01f56
tdf#93831 xlsx file full of pictures of numbers slow to open
No real idea why this fixes it - I suspect that the
referenced commit was forcing the initialisation of the
drawing layer too early.
This commit does not making the related xlsx file any slower
to load.
Change-Id: I1d8fdc5134a1b70bf214df642a9e7a386b853895
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101491
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit c9b81503a85a2763e1bfd1b6722fcf6d96a983e7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101467
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/oox/workbookfragment.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 969a0a6c29ec..f7cfca6fa9ae 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -344,12 +344,6 @@ void importSheetFragments( WorkbookFragment& rWorkbookHandler, SheetFragmentVect void WorkbookFragment::finalizeImport() { - // lock the model to prevent broadcasting, speeds up load a lot - getScDocument().InitDrawLayer(); - auto pModel = getScDocument().GetDrawLayer(); - bool bWasLocked = pModel->isLocked(); - pModel->setLock(true); - ISegmentProgressBarRef xGlobalSegment = getProgressBar().createSegment( PROGRESS_LENGTH_GLOBALS ); // read the theme substream @@ -473,6 +467,12 @@ void WorkbookFragment::finalizeImport() } } + // lock the model to prevent broadcasting, speeds up load a lot + getScDocument().InitDrawLayer(); + auto pModel = getScDocument().GetDrawLayer(); + bool bWasLocked = pModel->isLocked(); + pModel->setLock(true); + // load all worksheets importSheetFragments(*this, aSheetFragments); |