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

[Libreoffice Gerrit user]

 sc/source/core/tool/token.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit afbe6d46898f2c4137111afb4b08fb44b7713e28
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Thu Nov 8 15:08:48 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 17 17:46:29 2018 +0100

    blacklist svMatrix for calc threaded calculation
    
    If a formula contains a matrix, interpreting it will actually result
    in modifying it in some ways (e.g. ScInterpreter::PopRangeMatrix() calls
    SetErrorInterpreter() on the matrix).
    Testcase: rhbz#1645905
    
    Change-Id: I63742449ba0e4e375d6e459dc7bccd7e6b62920e
    Reviewed-on: https://gerrit.libreoffice.org/63187
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins
    Reviewed-on: https://gerrit.libreoffice.org/63379
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 8a448e9cd80c..494d1626cbc1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1367,6 +1367,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
             case svExternalDoubleRef:
             case svExternalSingleRef:
             case svExternalName:
+            case svMatrix:
                 SAL_INFO("sc.core.formulagroup", "opcode ocPush: variable type " << StackVarEnumToString(r.GetType())
                     << " disables threaded calculcation of formula group");
                 mbThreadingEnabled = false;
commit 319c88d41c2896937c8320bdaed44be01b25a0a1
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Oct 12 13:42:17 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Nov 17 17:46:18 2018 +0100

    blacklist svExternalName for calc threading
    
    It's the same like svExternal(Single|Double)Ref, there's a lot of thread-unsafe
    code involved.
    
    Change-Id: Ief8bbbd9393788c374215412ee5236ce6bb551fa
    Reviewed-on: https://gerrit.libreoffice.org/63176
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 3460e91ac853964015215ec75be7cf63361ca0e9)
    Reviewed-on: https://gerrit.libreoffice.org/63377
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index db03b6a3f649..8a448e9cd80c 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1366,6 +1366,7 @@ void ScTokenArray::CheckForThreading( const FormulaToken& r )
         {
             case svExternalDoubleRef:
             case svExternalSingleRef:
+            case svExternalName:
                 SAL_INFO("sc.core.formulagroup", "opcode ocPush: variable type " << StackVarEnumToString(r.GetType())
                     << " disables threaded calculcation of formula group");
                 mbThreadingEnabled = false;