summaryrefslogtreecommitdiff
path: root/sc/source/core
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2015-09-30 12:39:11 +0300
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-10-05 13:22:04 +0200
commitf6a887bd1e426306df5efb3b1796afb0277158ed (patch)
tree02065e4613b9cf052c450b46fdbf9a8aa637cbc5 /sc/source/core
parent457a9f405f3778547cc2fcafff445d89e87c7db6 (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/source/core')
-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 b4ba29b39959..1bb5e4ce71d6 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3804,9 +3804,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;
@@ -3832,6 +3829,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)