sc/source/core/data/documen9.cxx | 6 +-----
sc/source/core/data/formulacell.cxx | 3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 0406c5346c76ac2e02b69cb0cad830a89359c8c6
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Fri Jun 28 13:28:31 2013 -0400
Ensure that the group calculation path won't get called when it's disabled.
Change-Id: I0ea45616558bebf99c63862a0458776c67789bbc
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index f4b2258..db733f7 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -698,11 +698,7 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter& rEngine )
void ScDocument::RebuildFormulaGroups()
{
- bool bEnableFormulaGroups;
-
- bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
-
- if ( !bEnableFormulaGroups )
+ if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
return;
SCTAB nTab;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9c0a2b5..7e9cadc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3099,6 +3099,9 @@ public:
bool ScFormulaCell::InterpretFormulaGroup()
{
+ if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+ return false;
+
// Re-build formulae groups if necessary - ideally this is done at
// import / insert / delete etc. and is integral to the data structures
pDocument->RebuildFormulaGroups();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
