diff options
author | Eike Rathke <erack@redhat.com> | 2014-08-21 23:14:52 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2014-09-15 17:07:48 +0200 |
commit | 972258cec384491c5f45918b6153e3c66e372caf (patch) | |
tree | fad769f066176d42c22a85ec8940ac61d89b7b1e /sc/source/ui/inc/docsh.hxx | |
parent | 159c997a73c4bb0e1bb50c796f67957989ab9bce (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)
Conflicts:
sc/source/ui/app/scmod.cxx
sc/source/ui/docshell/docsh6.cxx
sc/source/ui/inc/docsh.hxx
init formula options once, fdo#82183
(cherry picked from commit 10b6bda51c9da5429ca562c70ce75ee03e5f4e56)
Change-Id: I6fa00fb4f442bf7c9410679e446ff460289e4b16
Reviewed-on: https://gerrit.libreoffice.org/11064
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/inc/docsh.hxx')
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 7e103902fb1f..b24be7d92d94 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -322,7 +322,7 @@ public: void UpdateLinks(); sal_Bool ReloadTabLinks(); - void SetFormulaOptions(const ScFormulaOptions& rOpt ); + void SetFormulaOptions( const ScFormulaOptions& rOpt, bool bForLoading = false ); virtual void CheckConfigOptions(); void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ); |