diff options
author | Eike Rathke <erack@redhat.com> | 2014-08-21 23:14:52 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-09-04 07:44:52 -0500 |
commit | a9969503d7a95bf266099466ca08f732f1251c03 (patch) | |
tree | 8ab8d0ea28f9c4491d7c02f19019fe27605f1bf5 | |
parent | 5496d431f991ce9e8e0dc953d2cb1d40db899ee0 (diff) |
fdo#82183 do not reset globals while loading a document
Destroying the function list while an instance of the Formula Wizard is
still open is a bad idea. Workaround not doing this when loading a
document due to a DDE function or external reference being entered in
the wizard.
(cherry picked from commit c0aba5007b6e468336b41138f099914c32f4b0cf)
init formula options once, fdo#82183
(cherry picked from commit 10b6bda51c9da5429ca562c70ce75ee03e5f4e56)
Change-Id: I6fa00fb4f442bf7c9410679e446ff460289e4b16
Reviewed-on: https://gerrit.libreoffice.org/11063
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r-- | sc/source/filter/oox/workbookhelper.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/app/scmod.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 60 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 |
6 files changed, 51 insertions, 23 deletions
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 59c87c53b993..1e6d31967ecd 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -681,6 +681,8 @@ void WorkbookGlobals::recalcFormulaCells() officecfg::Office::Calc::Formula::Load::OOXMLRecalcMode::set(sal_Int32(0), batch); ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions(); aOpt.SetOOXMLRecalcOptions(bHardRecalc ? RECALC_ALWAYS : RECALC_NEVER); + /* XXX is this really supposed to set the ScModule options? + * Not the ScDocShell options? */ SC_MOD()->SetFormulaOptions(aOpt); batch->commit(); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index dc97b247a015..9f4a7e9e2363 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1053,13 +1053,15 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if (pFormulaCfg && pFormulaCfg->GetCalcConfig() != rOpt.GetCalcConfig()) bCalcAll = true; - SetFormulaOptions( rOpt ); - if ( pDocSh ) { pDocSh->SetFormulaOptions( rOpt ); pDocSh->SetDocumentModified(); } + + // ScDocShell::SetFormulaOptions() may check for changed settings, so + // set the new options here after that has been called. + SetFormulaOptions( rOpt ); } diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 79a499bd4982..d44d49f64879 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -486,6 +486,8 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const ::com::sun::star::uno::R officecfg::Office::Calc::Formula::Load::ODFRecalcMode::set(sal_Int32(0), batch); ScFormulaOptions aOpt = SC_MOD()->GetFormulaOptions(); aOpt.SetODFRecalcOptions(bHardRecalc ? RECALC_ALWAYS : RECALC_NEVER); + /* XXX is this really supposed to set the ScModule options? + * Not the ScDocShell options? */ SC_MOD()->SetFormulaOptions(aOpt); batch->commit(); diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index f297c53d45d1..1b1f9a6c1334 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -428,7 +428,7 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L aDocument.SetDocOptions( aDocOpt ); aDocument.SetViewOptions( aViewOpt ); - SetFormulaOptions( aFormulaOpt ); + SetFormulaOptions( aFormulaOpt, bForLoading ); // Druck-Optionen werden jetzt direkt vor dem Drucken gesetzt diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 7dd8d0eaf46e..988dafda10c5 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -451,32 +451,54 @@ bool ScDocShell::ReloadTabLinks() return true; //! Fehler erkennen } -void ScDocShell::SetFormulaOptions(const ScFormulaOptions& rOpt ) +void ScDocShell::SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoading ) { aDocument.SetGrammar( rOpt.GetFormulaSyntax() ); - // This needs to be called first since it may re-initialize the entire - // opcode map. - if (rOpt.GetUseEnglishFuncName()) + // This is nasty because it resets module globals from within a docshell! + // For actual damage caused see fdo#82183 where an unconditional + // ScGlobal::ResetFunctionList() (without checking GetUseEnglishFuncName()) + // lead to a crash becasuse the function list was still used by the Formula + // Wizard when loading the second document. + // Do the stupid stuff only when we're not called while loading a document. + + /* TODO: bForLoading is a workaround, rather get rid of setting any + * globals from per document instances like ScDocShell. */ + + /* XXX this is utter crap, we rely on the options being set here at least + * once, for the very first document, empty or loaded. */ + static bool bInitOnce = true; + + if (!bForLoading || bInitOnce) { - // switch native symbols to English. - ScCompiler aComp(NULL, ScAddress()); - ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH); - ScCompiler::SetNativeSymbols(xMap); - } - else - // re-initialize native symbols with localized function names. - ScCompiler::ResetNativeSymbols(); + bool bForceInit = bInitOnce; + bInitOnce = false; + if (bForceInit || rOpt.GetUseEnglishFuncName() != SC_MOD()->GetFormulaOptions().GetUseEnglishFuncName()) + { + // This needs to be called first since it may re-initialize the entire + // opcode map. + if (rOpt.GetUseEnglishFuncName()) + { + // switch native symbols to English. + ScCompiler aComp(NULL, ScAddress()); + ScCompiler::OpCodeMapPtr xMap = aComp.GetOpCodeMap(::com::sun::star::sheet::FormulaLanguage::ENGLISH); + ScCompiler::SetNativeSymbols(xMap); + } + else + // re-initialize native symbols with localized function names. + ScCompiler::ResetNativeSymbols(); - // Force re-population of function names for the function wizard, function tip etc. - ScGlobal::ResetFunctionList(); + // Force re-population of function names for the function wizard, function tip etc. + ScGlobal::ResetFunctionList(); + } - // Update the separators. - ScCompiler::UpdateSeparatorsNative( - rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow()); + // Update the separators. + ScCompiler::UpdateSeparatorsNative( + rOpt.GetFormulaSepArg(), rOpt.GetFormulaSepArrayCol(), rOpt.GetFormulaSepArrayRow()); - // Global interpreter settings. - ScInterpreter::SetGlobalConfig(rOpt.GetCalcConfig()); + // Global interpreter settings. + ScInterpreter::SetGlobalConfig(rOpt.GetCalcConfig()); + } // Per document interpreter settings. SetCalcConfig( rOpt.GetCalcConfig()); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 89706d2fd5b4..b17a3ab81d33 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -324,7 +324,7 @@ public: void UpdateLinks() SAL_OVERRIDE; bool ReloadTabLinks(); - void SetFormulaOptions(const ScFormulaOptions& rOpt ); + void SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoading = false ); void SetCalcConfig( const ScCalcConfig& rConfig ); virtual void CheckConfigOptions() SAL_OVERRIDE; |