sc/source/filter/oox/workbookfragment.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 30f222c91fa816a7863bf4bfc4a36e503e0bf2d3
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Apr 8 17:27:41 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 9 11:14:50 2021 +0200
tdf#141416: partial revert of the fix for tdf#81396
d4743045a0b320449d07a957463a76bb8b13f939 < the cells need to
be imported before we handle charts, tdf#81396 >
Import time of sample file in tdf#141416 goes from more than an hour
to 1 minute while keeping tdf#81396 fixed
Unittest for tdf#81396 added in 9a59068fc31d7150e255ada91c59b8299636f185
Change-Id: Ic15d57945069397076c483b6ef8f3070057db317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113818
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index e89f0c8458c3..7ad690674892 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -481,13 +481,10 @@ void WorkbookFragment::finalizeImport()
// final conversions, e.g. calculation settings and view settings
finalizeWorkbookImport();
- //
+
//stop preventing establishment of listeners as is done in
//ScDocShell::AfterXMLLoading() for ods
getScDocument().SetInsertingFromOtherDoc(false);
- getDocImport().finalize();
-
- recalcFormulaCells();
for( WorksheetHelper* pHelper : aHelpers )
{
@@ -501,6 +498,10 @@ void WorkbookFragment::finalizeImport()
rxSheetGlob.reset();
}
+ getDocImport().finalize();
+
+ recalcFormulaCells();
+
OUString aRevHeadersPath =
getFragmentPathFromFirstType(CREATE_OFFICEDOC_RELATION_TYPE("revisionHeaders"));
if (!aRevHeadersPath.isEmpty())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
