diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-09-30 12:39:11 +0300 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-05 13:22:56 +0200 |
| commit | 954dab67b6795cb030deacd78fb66a308de60392 (patch) | |
| tree | 3344fc6932471dd6c3e549ac6b8e187a62267229 | |
| parent | 75d6000da3d185da1694631c4444be8dd9dd5eac (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.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 71b30d025154..7cc801bc01a1 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3767,9 +3767,6 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r bool ScFormulaCell::InterpretFormulaGroup() { - if (!officecfg::Office::Common::Misc::UseOpenCL::get()) - return false; - if (!mxGroup || !pCode) return false; @@ -3795,6 +3792,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) |