[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/source

[Eike Rathke]

 sc/source/core/tool/interpr4.cxx |   51 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 6 deletions(-)

New commits:
commit ea525e91338a164bbc76954869295f1e939095ae
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jan 27 14:55:20 2017 +0100

    Resolves: tdf#105558 accept numeric BASIC return types as numeric
    
    ... not only SbxINTEGER, SbxLONG, SbxSINGLE and SbxDOUBLE.
    
    Change-Id: I75d892f5ae60ef1b18bd86e64777dea746e35a1f
    (cherry picked from commit 9a283e44ca7de2f2fa276544b4d49cff495bd53d)
    Reviewed-on: https://gerrit.libreoffice.org/33616
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 4c34994..f266491 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3122,6 +3122,34 @@ static bool lcl_setVBARange( ScRange& aRange, ScDocument* pDok, SbxVariable* pPa
     return bOk;
 }
 
+static bool lcl_isNumericResult( double& fVal, const SbxVariable* pVar )
+{
+    switch (pVar->GetType())
+    {
+        case SbxINTEGER:
+        case SbxLONG:
+        case SbxSINGLE:
+        case SbxDOUBLE:
+        case SbxCURRENCY:
+        case SbxDATE:
+        case SbxUSHORT:
+        case SbxULONG:
+        case SbxINT:
+        case SbxUINT:
+        case SbxSALINT64:
+        case SbxSALUINT64:
+        case SbxDECIMAL:
+            fVal = pVar->GetDouble();
+            return true;
+        case SbxBOOL:
+            fVal = (pVar->GetBool() ? 1.0 : 0.0);
+            return true;
+        default:
+            ;   // nothing
+    }
+    return false;
+}
+
 #endif
 
 void ScInterpreter::ScMacro()
@@ -3341,6 +3369,7 @@ void ScInterpreter::ScMacro()
             pMacroMgr->AddDependentCell(pModule->GetName(), pMyFormulaCell);
         }
 
+        double fVal;
         SbxDataType eResType = refRes->GetType();
         if( SbxBase::GetError() )
         {
@@ -3350,9 +3379,21 @@ void ScInterpreter::ScMacro()
         {
             PushNoValue();
         }
-        else if( eResType >= SbxINTEGER && eResType <= SbxDOUBLE )
+        else if (lcl_isNumericResult( fVal, refRes.get()))
         {
-            PushDouble( refRes->GetDouble() );
+            switch (eResType)
+            {
+                case SbxDATE:
+                    nFuncFmtType = css::util::NumberFormat::DATE;
+                break;
+                case SbxBOOL:
+                    nFuncFmtType = css::util::NumberFormat::LOGICAL;
+                break;
+                // Do not add SbxCURRENCY, we don't know which currency.
+                default:
+                    ;   // nothing
+            }
+            PushDouble( fVal );
         }
         else if ( eResType & SbxARRAY )
         {
@@ -3387,7 +3428,6 @@ void ScInterpreter::ScMacro()
                 if ( pMat )
                 {
                     SbxVariable* pV;
-                    SbxDataType eType;
                     for ( SCSIZE j=0; j < nR; j++ )
                     {
                         sal_Int32 nIdx[ 2 ];
@@ -3398,10 +3438,9 @@ void ScInterpreter::ScMacro()
                         {
                             nIdx[ nColIdx ] = nCs + static_cast<sal_Int32>(i);
                             pV = pDimArray->Get32( nIdx );
-                            eType = pV->GetType();
-                            if ( eType >= SbxINTEGER && eType <= SbxDOUBLE )
+                            if ( lcl_isNumericResult( fVal, pV) )
                             {
-                                pMat->PutDouble( pV->GetDouble(), i, j );
+                                pMat->PutDouble( fVal, i, j );
                             }
                             else
                             {