diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2018-11-08 15:08:48 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-17 17:46:29 +0100 |
commit | afbe6d46898f2c4137111afb4b08fb44b7713e28 (patch) | |
tree | afdd95111f1957126d33bfc02b0a7d14ba8122b0 /sc | |
parent | 319c88d41c2896937c8320bdaed44be01b25a0a1 (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
Reviewed-on: https://gerrit.libreoffice.org/63379
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-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 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; |