[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/oox/workbookhelper.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit bc199d7eaeeb24760eced5573e59ac285bde5bc0
Author: Noel Power <noel.power at suse.com>
Date:   Tue Dec 18 14:33:20 2012 +0000

    finalize pivot *before* scenario sheet to ensure table numbers are correct
    
    Change-Id: I15cf378b51b1ecfbd05c7013e5a5b69fb87fdafb

diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index e5521e7..c3c2fbb 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -597,11 +597,6 @@ void WorkbookGlobals::finalize()
         // #i79826# enable updating automatic row height after loading the document
         aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true );
 
-        // 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)
@@ -674,6 +669,12 @@ void WorkbookHelper::finalizeWorkbookImport()
 
     // need to import formulas before scenarios
     mrBookGlob.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();
+
     /*  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. */