diff options
| author | Eike Rathke <erack@redhat.com> | 2015-04-20 18:47:00 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-04-20 18:48:10 +0200 |
| commit | 46befa93818dc7dedc614a08bf0266b0723f9284 (patch) | |
| tree | 393a677cd92045894a6db64e945c5298f3ea83ad /sc | |
| parent | b756a907eadb803c8014c7a875bb0b0ee32c50b3 (diff) | |
clarify that only text in arrays is to be converted, tdf#88547 follow-up
Change-Id: I7cebaf1a2907f4beb10e128ea5d479df45c1e1c5
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/inc/interpre.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr3.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index d1d46704d698..19b779d2696a 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -816,8 +816,8 @@ void ScMedian(); double GetMedian( ::std::vector<double> & rArray ); double GetPercentile( ::std::vector<double> & rArray, double fPercentile ); double GetPercentileExclusive( ::std::vector<double> & rArray, double fPercentile ); -void GetNumberSequenceArray( sal_uInt8 nParamCount, ::std::vector<double>& rArray, bool bAllowText ); -void GetSortArray( sal_uInt8 nParamCount, ::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder, bool bAllowText ); +void GetNumberSequenceArray( sal_uInt8 nParamCount, ::std::vector<double>& rArray, bool bConvertTextInArray ); +void GetSortArray( sal_uInt8 nParamCount, ::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder, bool bConvertTextInArray ); void QuickSort(::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder = NULL); void ScModalValue(); void ScModalValue_Multi(); diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 1dd07f5efc8e..a397bdd3435c 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -3662,7 +3662,7 @@ void ScInterpreter::ScTrimMean() } } -void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double>& rArray, bool bAllowText ) +void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double>& rArray, bool bConvertTextInArray ) { ScAddress aAdr; ScRange aRange; @@ -3724,7 +3724,7 @@ void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double for (SCSIZE i = 0; i < nCount; ++i) rArray.push_back( pMat->GetDouble(i)); } - else if (bAllowText) + else if (bConvertTextInArray) { for (SCSIZE i = 0; i < nCount; ++i) { @@ -3782,9 +3782,9 @@ void ScInterpreter::GetNumberSequenceArray( sal_uInt8 nParamCount, vector<double PopError(); } -void ScInterpreter::GetSortArray( sal_uInt8 nParamCount, vector<double>& rSortArray, vector<long>* pIndexOrder, bool bAllowText ) +void ScInterpreter::GetSortArray( sal_uInt8 nParamCount, vector<double>& rSortArray, vector<long>* pIndexOrder, bool bConvertTextInArray ) { - GetNumberSequenceArray( nParamCount, rSortArray, bAllowText ); + GetNumberSequenceArray( nParamCount, rSortArray, bConvertTextInArray ); if (rSortArray.size() > MAX_ANZ_DOUBLE_FOR_SORT) SetError( errStackOverflow); else if (rSortArray.empty()) |