sc/source/ui/app/scmod.cxx | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 0ac191565d541f66d4cc88ec54c8f3b5e03f0989
Author: Eike Rathke <er...@redhat.com>
Date: Sat Oct 17 00:13:02 2015 +0200
ignore "current document" values at module level, tdf#92256 follow-up
Change-Id: I3540ccce9bee652f838efc86dc9abc6fc2416819
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index dcf9d51..5b59330 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1039,7 +1039,19 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
// ScDocShell::SetFormulaOptions() may check for changed settings, so
// set the new options here after that has been called.
- SetFormulaOptions( rOpt );
+ if (!bCalcAll || rOpt.GetWriteCalcConfig())
+ {
+ // CalcConfig is new, didn't change or is global, simply set all.
+ SetFormulaOptions( rOpt );
+ }
+ else
+ {
+ // If "only for current document" was checked, reset those affected
+ // by that setting to previous values.
+ ScFormulaOptions aNewOpt( rOpt);
+ aNewOpt.GetCalcConfig().MergeDocumentSpecific(
pFormulaCfg->GetCalcConfig());
+ SetFormulaOptions( aNewOpt);
+ }
}
// ViewOptions
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
