diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-07 23:09:43 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-08-12 19:46:27 -0400 |
| commit | 6775874b54abcd625e220f9c7401cb04050135b4 (patch) | |
| tree | f3c66b6b6af714b56dc08a2574471e57c8d8c4eb | |
| parent | cccf0fe7a6d8f82e966c320a13875d67fdb911f6 (diff) | |
Disable vectorization on named ranges for now.
Change-Id: Ibc10d5eb9afff6062106c952aa2e7d3f9cb58100
| -rw-r--r-- | sc/source/core/data/formulacell.cxx | 26 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 3 |
2 files changed, 3 insertions, 26 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 4a05c4c2c7e5..fd103bc9c844 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3366,32 +3366,6 @@ public: mrGroupTokens.AddToken(aTok); } break; - case svIndex: - { - // Named range. - ScRangeName* pNames = mrDoc.GetRangeName(); - if (!pNames) - // This should never fail. - return false; - - ScRangeData* pRange = pNames->findByIndex(p->GetIndex()); - if (!pRange) - // No named range exists by that index. - return false; - - ScTokenArray* pNamedTokens = pRange->GetCode(); - if (!pNamedTokens) - // This named range is empty. - return false; - - mrGroupTokens.AddOpCode(ocOpen); - - if (!convert(*pNamedTokens)) - return false; - - mrGroupTokens.AddOpCode(ocClose); - } - break; default: mrGroupTokens.AddToken(*pToken); } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index d74182d9a065..9f5838013c6a 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1347,6 +1347,9 @@ void ScTokenArray::CheckToken( const FormulaToken& r ) ; } } + + if (eOp == ocName) + meVectorState = FormulaVectorDisabled; } bool ScTokenArray::ImplGetReference( ScRange& rRange, const ScAddress& rPos, bool bValidOnly ) const |