diff options
| author | Eike Rathke <erack@redhat.com> | 2017-12-17 00:46:07 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-01-07 15:19:12 +0100 |
| commit | 174822c33c8d35d514fbb713e6a22d20559bb034 (patch) | |
| tree | e2af512ab36757f108adcd474fada91109b9a229 | |
| parent | 5ecffcb48140eb055e71b0d8905d693036e61bc6 (diff) | |
Related: tdf#114251 disable ocName named expressions for vectorization
Recursive checking of their token arrays would be needed.
This solves the slowness in the non-threading case of tdf#114251
because no arrays are generated for the named ranges, which is
rather a lucky workaround than a solution.
The wrong handling of range references in general (array where
scalar is expected, no implicit intersection) still persists.
Change-Id: I57385bd95efa584108d93d724921285c97a91a45
Reviewed-on: https://gerrit.libreoffice.org/46623
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 3193e78aba75c5b38d2683d9fd8593820048e8b9)
Reviewed-on: https://gerrit.libreoffice.org/46669
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | sc/source/core/tool/token.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 027786958ceb..7a9db36dbb1a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1595,6 +1595,22 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) SAL_INFO("sc.core.formulagroup", "opcode " << formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp) << " disables S/W interpreter for formula group"); meVectorState = FormulaVectorDisabledNotInSoftwareSubset; } + else + { + // All the rest, special commands, separators, error codes, ... + switch (eOp) + { + case ocName: + // Named expression would need "recursive" handling of its + // token array for vector state in + // ScFormulaCell::InterpretFormulaGroup() and below. + SAL_INFO("sc.opencl", "opcode " << formula::FormulaCompiler().GetOpCodeMap(sheet::FormulaLanguage::ENGLISH)->getSymbol(eOp) << " disables vectorisation for formula group"); + meVectorState = FormulaVectorDisabledByOpCode; + break; + default: + ; // nothing + } + } } bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, bool bValidOnly ) const |