[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-6' - sc/source

[Tor Lillqvist]

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

New commits:
commit 42564bda9cb0ac278bff15f3169b379950a5a47e
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
    Reviewed-on: https://gerrit.libreoffice.org/19168
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

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