diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2018-11-08 15:08:48 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2018-11-13 13:20:36 +0100 |
commit | 823f40e011774fb044d64390f59661867cb38d9f (patch) | |
tree | 37dc26fef88584aa50d5c794eaaa9b2c5d0deef6 | |
parent | f9026deba0581759146205237eb739f37463ba47 (diff) |
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@collabora.com>
Tested-by: Jenkins
-rw-r--r-- | sc/source/core/tool/token.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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; |