summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-10-16 18:28:24 +0300
committerDennis Francis <dennis.francis@collabora.co.uk>2017-11-21 13:49:52 +0530
commit0a308354df1570c83cd499b017461ff364458d13 (patch)
tree360fedc92145c4dad588c702e86c99a529f7a76d
parentbcc6e4dd480c708bafafe44fd47591d8566f1997 (diff)
Check whether ScTokenArray::CheckToken() has disabled threading of the group
Otherwise the aThreadedCalcBlackList check in CheckToken() has no effect, we would still attempt the threaded code path. Change-Id: I08dc2dd174459615ab8a11dbb819e39fc5437d10
-rw-r--r--sc/source/core/data/formulacell.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 615fbb8056f7..cf036ad13734 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4341,7 +4341,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
return false;
}
- if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() && officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get())
+ if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() && pCode->GetVectorState() != FormulaVectorDisabledNotInSubSet && officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get())
{
// iterate over code in the formula ...
// ensure all input is pre-calculated -