summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-09-30 12:39:11 +0300
committerAndras Timar <andras.timar@collabora.com>2015-10-07 08:32:14 +0200
commit89469ff777e4ac5e6cce4bd72c4aef843d0a9255 (patch)
tree292b3a9423d884aa397bef8cd41ae7d0769e2aef
parent6f77377f436a411dcbbf56c538f485427653741a (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
-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 0545f560cafd..a64229c63194 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3775,9 +3775,6 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r
bool ScFormulaCell::InterpretFormulaGroup()
{
- if (!officecfg::Office::Common::Misc::UseOpenCL::get())
- return false;
-
if (!mxGroup || !pCode)
return false;
@@ -3803,6 +3800,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)