sc/source/filter/oox/workbookfragment.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
New commits: commit 5ca7cdfbe2ce2c30dbb67db1a482538c9d2f1081 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Thu Aug 27 19:02:27 2020 +0200 Commit: Aron Budea <aron.bu...@collabora.com> CommitDate: Wed Jul 28 11:31:42 2021 +0200 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.gran...@collabora.co.uk> (cherry picked from commit c9b81503a85a2763e1bfd1b6722fcf6d96a983e7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101467 (cherry picked from commit 3905cb1b2c723617298dd525cf18669f3ca5720b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119447 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> Reviewed-by: Aron Budea <aron.bu...@collabora.com> diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index d9f20cbedb77..1f9211d85ca2 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -345,12 +345,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 @@ -474,6 +468,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); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits