diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-25 16:38:52 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-06-25 18:49:57 -0400 |
| commit | b5ecee665f37527d2109d383090d8190c0e4621a (patch) | |
| tree | e72aecbfd6cf9745aabea7079bd25fc1af2e038e /sc | |
| parent | d69c8d1151ceb8e4c7cf650efd36a2b10058c4d2 (diff) | |
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)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index fba445f50c51..ca61154db340 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -760,6 +760,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(); @@ -779,12 +786,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 ------------------------------------------------------------- |