sc/source/core/tool/interpr3.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 104a1e641554be2e789758ae67c0e24620df8035 Author: Winfried Donkers <winfrieddonk...@libreoffice.org> Date: Mon Jan 19 17:41:52 2015 +0100 fdo#88547 allow inline date-arrays for array functions Change-Id: I090633944f6514964949566ffe94038b565abff4 Reviewed-on: https://gerrit.libreoffice.org/14019 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 67a5b12..998263d 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -3719,6 +3719,14 @@ 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; @@ -3739,7 +3747,6 @@ 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()) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits