[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - sc/source

[Damien Chambe]

 sc/source/filter/oox/workbookhelper.cxx |   13 +++++++------
 sc/source/ui/view/drawview.cxx          |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 4b708a14d6a9cb0643c6f405a47f4ebd8044494b
Author: Damien Chambe <damien.chambe at gmail.com>
Date:   Sun Jun 15 21:17:41 2014 +0200

    Resolves fdo#76160 Calc invalid image position on zooming
    
    Change-Id: Idd268a3378a902c173dc4d75d879714c2e919b2d
    Reviewed-on: https://gerrit.libreoffice.org/9792
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    (cherry picked from commit b8d84a3bf59212a9652f76d7852c81191b8c8a3b)

diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 63048af..77d7941 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -321,7 +321,7 @@ void ScDrawView::RecalcScale()
     if (nEndCol<20)
         nEndCol = 20;
     if (nEndRow<20)
-        nEndRow = 1000;
+        nEndRow = 20;
 
     ScDrawUtil::CalcScale( pDoc, nTab, 0,0, nEndCol,nEndRow, pDev,aZoomX,aZoomY,nPPTX,nPPTY,
                             aScaleX,aScaleY );
commit 0a0e7a5df9f41924a454abde636b732502e6a712
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jun 25 16:38:52 2014 -0400

    bnc#882595: Process VBA blobs before formula cells.
    
    So that formula cells with user-defined functions will be interpreted
    correctly.
    
    Change-Id: I49c10109575f9f82d7f85dea63590bf02b70e041
    (cherry picked from commit 5e83804da815a982aed567a8cae4cc078491dcbd)

diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 15b676a..59c87c5 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -751,6 +751,13 @@ void WorkbookHelper::finalizeWorkbookImport()
     mrBookGlob.getWorkbookSettings().finalizeImport();
     mrBookGlob.getViewSettings().finalizeImport();
 
+    // Import the VBA project (after finalizing workbook settings which
+    // contains the workbook code name).  Do it before processing formulas in
+    // order to correctly resolve VBA custom function names.
+    StorageRef xVbaPrjStrg = mrBookGlob.getVbaProjectStorage();
+    if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
+        getBaseFilter().getVbaProject().importModulesAndForms( *xVbaPrjStrg, getBaseFilter().getGraphicHelper() );
+
     // need to import formulas before scenarios
     mrBookGlob.getFormulaBuffer().finalizeImport();
 
@@ -770,12 +777,6 @@ void WorkbookHelper::finalizeWorkbookImport()
         sheets. Automatic numbering is set by passing the value 0. */
     PropertySet aDefPageStyle( getStyleObject( "Default", true ) );
     aDefPageStyle.setProperty< sal_Int16 >( PROP_FirstPageNumber, 0 );
-
-    /*  Import the VBA project (after finalizing workbook settings which
-        contains the workbook code name). */
-    StorageRef xVbaPrjStrg = mrBookGlob.getVbaProjectStorage();
-    if( xVbaPrjStrg.get() && xVbaPrjStrg->isStorage() )
-        getBaseFilter().getVbaProject().importModulesAndForms( *xVbaPrjStrg, getBaseFilter().getGraphicHelper() );
 }
 
 // document model -------------------------------------------------------------