[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source

[Eike Rathke]

 sc/source/filter/oox/workbookhelper.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0eeab7204ac244bebb0f8c4d8a8891037423534a
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Aug 13 17:08:57 2012 -0400

    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.
    
    (cherry picked from commit ae296a60781a2b5d5b7523cbda3444e3dd21506f)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>
    
    Conflicts:
    
    	sc/source/filter/oox/workbookhelper.cxx
    
    Change-Id: Ib04f4902863b091c483711eeaf31a282f6feaf67

diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index e8df821..071b9a6 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -590,9 +590,17 @@ 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();
+
         // hack, setting it true the second time will delete the cache
         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)
@@ -659,10 +667,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. */