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

[Luboš Luňák]

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

New commits:
commit 4c42677aad1b91f0b51452560e23bdd706106d0f
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Mon May 28 16:01:49 2018 +0200

    blacklist ocDBSum for calc's threading
    
    Triggers a number of asserts on hard-recalc (Shift+Ctrl+F9) with ooo#58183-1
    that would require passing ScContextInterpreter* to a number of functions,
    so just blacklist it.
    
    Change-Id: I0c3666a3423cea7c77f530480b8b63506c4bbad2
    Reviewed-on: https://gerrit.libreoffice.org/54933
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/55274
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    Tested-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index a973e06332cf..575ebd64cad4 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1319,7 +1319,8 @@ void ScTokenArray::CheckForThreading( OpCode eOp  )
         ocMatch,
         ocCell,
         ocInfo,
-        ocStyle
+        ocStyle,
+        ocDBSum
     });
 
     // We only call this if it was already disabled