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

[Luboš Luňák]

 sc/source/core/tool/formulagroup.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a0bf6f4f30a3b020dcab1e1e7b2517948cc4b9c
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Fri Jun 15 18:25:00 2018 +0200

    do not allow threading in SwInterpreter for threading-disabled tokens
    
    If a token is not suitable for the generic threading code, it's presumably
    not suitable for threading with SwInterpreter either. This is possibly
    already handled by checks in CheckToken(), but this can't hurt, just
    in case a token is in CheckForThreading() but not in CheckToken().
    
    Change-Id: Ib969a21e9021fc6debc2131dc718419c6b25d363
    Reviewed-on: https://gerrit.libreoffice.org/55886
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Luboš Luňák <l.lunak at collabora.com>
    (cherry picked from commit 39dc45b23a6aacb6439162cbbb7762f3d0c0b5fb)
    Reviewed-on: https://gerrit.libreoffice.org/56140
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index b494d25d1146..ffd961ae7b99 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -368,7 +368,7 @@ bool FormulaGroupInterpreterSoftware::interpret(ScDocument& rDoc, const ScAddres
 
     static const bool bThreadingProhibited = std::getenv("SC_NO_THREADED_CALCULATION");
 
-    bool bUseThreading = !bThreadingProhibited && ScCalcConfig::isThreadingEnabled();
+    bool bUseThreading = !bThreadingProhibited && ScCalcConfig::isThreadingEnabled() && rCode.IsEnabledForThreading();
 
     SvNumberFormatter* pFormatter = rDoc.GetNonThreadedContext().GetFormatTable();