Kaydet (Commit) ae296a60 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

fdo#53456: initialize pivot tables *after* the formula cells.

Or else all the formula cells within pivot table's source ranges would
be treated as if they are empty.

Change-Id: Ib04f4902863b091c483711eeaf31a282f6feaf67
üst bf70f37c
......@@ -590,7 +590,14 @@ void WorkbookGlobals::finalize()
aPropSet.setProperty( PROP_IsExecuteLinkEnabled, true );
// #i79826# enable updating automatic row height after loading the document
aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
getFormulaBuffer().finalizeImport();
// Insert all pivot tables. Must be done after loading all sheets and
// formulas, because data pilots expect existing source data on
// creation.
getPivotTables().finalizeImport();
// #i76026# enable Undo after loading the document
aPropSet.setProperty( PROP_IsUndoEnabled, true );
// disable editing read-only documents (e.g. from read-only files)
......@@ -657,10 +664,6 @@ void WorkbookHelper::finalizeWorkbookImport()
mrBookGlob.getWorkbookSettings().finalizeImport();
mrBookGlob.getViewSettings().finalizeImport();
/* Insert all pivot tables. Must be done after loading all sheets, because
data pilots expect existing source data on creation. */
mrBookGlob.getPivotTables().finalizeImport();
/* Insert scenarios after all sheet processing is done, because new hidden
sheets are created for scenarios which would confuse code that relies
on certain sheet indexes. Must be done after pivot tables too. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment