[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/core/tool/interpr3.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 18de9b1de1aa404b3ca12e2018e5e5e220dd9786
Author: Eike Rathke <erack at redhat.com>
Date:   Mon Mar 9 14:02:20 2015 +0100

    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()

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 1769c2f..051bb66 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3719,14 +3719,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;
@@ -3747,6 +3739,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())