diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-13 17:08:57 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-08-13 17:10:32 -0400 |
| commit | ae296a60781a2b5d5b7523cbda3444e3dd21506f (patch) | |
| tree | 0ba2e0d4fcfb36496448c38f8d12a6082d103a42 /sc | |
| parent | bf70f37c9243b6c94318f093871563c8c3784aa6 (diff) | |
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
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index db6342dad315..bf7b95573ecd 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -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. */ |