From 823f40e011774fb044d64390f59661867cb38d9f Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 8 Nov 2018 15:08:48 +0100 Subject: 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 Tested-by: Jenkins --- sc/source/core/tool/token.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 293b238150aa..8436be93f5ff 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1334,6 +1334,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 calculation of formula group"); mbThreadingEnabled = false; -- cgit