[Libreoffice-commits] core.git: Branch 'feature/fixes10' - sc/source

[Tor Lillqvist]

 sc/source/core/data/formulacell.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 81fdacfb7711c45d6c27a5d3427565b368a70183
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 30 12:39:11 2015 +0300

    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

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index b55142f..f38e7da 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)