diff options
| author | Eike Rathke <erack@redhat.com> | 2017-12-17 17:34:15 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-01-22 23:48:14 +0100 |
| commit | 811b40327c15e197b0967393e4071f48a60af42a (patch) | |
| tree | fd098ce88b3cc1122b3a69fdd73340a5805cca10 | |
| parent | 0443eb8bf5ed79d13ec1aa49ac83ed2b2e8eea54 (diff) | |
Related: tdf#114251 disable vectorization of svDoubleRef
It doesn't work, not knowing how to handle implicit intersections
not only produces huge unnecessary matrix operations but also
delivers wrong results.
Unit test will follow as a separate commit.
Change-Id: I14982d4a53d6af57196da998e53d426502c22fec
Reviewed-on: https://gerrit.libreoffice.org/46647
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 67444cbe5dae6e24db776ab712017ad063319276)
Reviewed-on: https://gerrit.libreoffice.org/46670
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | sc/source/core/data/grouptokenconverter.cxx | 13 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/sc/source/core/data/grouptokenconverter.cxx b/sc/source/core/data/grouptokenconverter.cxx index 410e3662ae78..ee93866cc2e7 100644 --- a/sc/source/core/data/grouptokenconverter.cxx +++ b/sc/source/core/data/grouptokenconverter.cxx @@ -165,6 +165,18 @@ bool ScGroupTokenConverter::convert( ScTokenArray& rCode, sc::FormulaLogger::Gro break; case svDoubleRef: { + /* FIXME: this simply does not work, it doesn't know + * a) the context of implicit intersection, for which creating + two arrays dows not only result in huge unnecessary matrix + operations but also produces wrong results, e.g. =B:B/C:C + * b) when to keep a reference as a reference depending on the + expected parameter type, e.g. INDEX(), OFFSET() and + others (though that *may* be disabled by OpCode already). + * Until both are solved keep the reference. */ + mrGroupTokens.AddToken(*p); + break; + +#if 0 ScComplexRefData aRef = *p->GetDoubleRef(); ScRange aAbs = aRef.toAbs(mrPos); @@ -237,6 +249,7 @@ bool ScGroupTokenConverter::convert( ScTokenArray& rCode, sc::FormulaLogger::Gro //ensure that backing storage exists for our lifetime mxFormulaGroupContext = mrDoc.GetFormulaGroupContext(); } +#endif } break; case svIndex: diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 562d03f62394..f73c431d3316 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1549,10 +1549,11 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) // Don't change the state. break; case svSingleRef: - case svDoubleRef: // Depends on the reference state. meVectorState = FormulaVectorCheckReference; break; + case svDoubleRef: + // Does not work yet, see ScGroupTokenConverter::convert() case svError: case svEmptyCell: case svExternal: |