diff options
| author | Eike Rathke <erack@redhat.com> | 2015-03-09 14:02:20 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-03-09 14:23:31 +0100 |
| commit | 3feb8d18cfc7620891976c7fe116988a57192b79 (patch) | |
| tree | 07a38bc2dfde09499ed004df9c7404cc9eae6fc0 | |
| parent | 89446eb5ae51b2004fb86f7af5be58754ece8fb3 (diff) | |
Revert "fdo#88547 allow inline date-arrays for array functions", tdf#89872
This reverts commit 104a1e641554be2e789758ae67c0e24620df8035.
A number sequence has to ignore all string and empty elements by
definition, see tdf#89872 for an example regression, further affected
are all functions that use ScInterpreter::GetSortArray() which in turn
uses ScInterpreter::GetNumberSequenceArray()
(cherry picked from commit 18de9b1de1aa404b3ca12e2018e5e5e220dd9786)
| -rw-r--r-- | sc/source/core/tool/interpr3.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index ead9dec08a93..5e0af0df2825 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -3721,14 +3721,6 @@ void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double for (SCSIZE i = 0; i < nCount; ++i) if (!pMat->IsString(i)) rArray.push_back( pMat->GetDouble(i)); - else - { - // fdo 88547 try to convert string to (date)value - OUString aStr = pMat->GetString( i ).getString(); - double fVal = ConvertStringToValue( aStr ); - if ( !nGlobalError ) - rArray.push_back( fVal ); - } } } break; @@ -3749,6 +3741,7 @@ void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double void ScInterpreter::GetSortArray( sal_uInt8 nParamCount, vector<double>& rSortArray, vector<long>* pIndexOrder ) { GetNumberSequenceArray( nParamCount, rSortArray); + if (rSortArray.size() > MAX_ANZ_DOUBLE_FOR_SORT) SetError( errStackOverflow); else if (rSortArray.empty()) |