summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-09-30 12:39:11 +0300
committerTor Lillqvist <tml@collabora.com>2015-09-30 14:51:33 +0300
commit8727afe771a3e4d585e98ca9cceff2504e500bb0 (patch)
tree8abec64f0b8ec294d7a83ceaf2ccd50c37d3bf4d /sc
parentcf2921ccae8531cf13921c67ad85c5aa0d924b08 (diff)
Probably good to move the more complicates test after the light-weight ones
We will return false if any of the tests here match, so good to test the trivial things first before ones involving a potentially complex function call. Change-Id: I531282041c888799d37d95ae773daa349e60a37d
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/formulacell.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 6be8b2e36da2..06f6439fafc3 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3866,9 +3866,6 @@ int splitup(int N, int K, int& A)
bool ScFormulaCell::InterpretFormulaGroup()
{
- if (!officecfg::Office::Common::Misc::UseOpenCL::get())
- return false;
-
if (!mxGroup || !pCode)
return false;
@@ -3894,6 +3891,9 @@ bool ScFormulaCell::InterpretFormulaGroup()
return false;
}
+ if (!officecfg::Office::Common::Misc::UseOpenCL::get())
+ return false;
+
// TODO : Disable invariant formula group interpretation for now in order
// to get implicit intersection to work.
if (mxGroup->mbInvariant && false)