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

[Noel Power]

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

New commits:
commit 35f9cd513d6dd796a5bc54c51df3961a674addcb
Author: Noel Power <noel.power at suse.com>
Date:   Wed Jul 10 14:19:05 2013 +0100

    additionally handle string types for ScMacro dealing with svExternalSingleRef
    
    Change-Id: Ib0e5077f58fa8d3918433e18e8815fd13fdc6391

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 72563fd..8688b12 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3213,15 +3213,14 @@ void ScInterpreter::ScMacro()
             {
                 ScExternalRefCache::TokenRef pToken;
                 PopExternalSingleRef(pToken);
-                if ( nGlobalError )
-                {
-                    SetError( errIllegalArgument);
-                    bOk = false;
-                }
+                if ( pToken->GetType() == svString )
+                    pPar->PutString( pToken->GetString() );
+                else if ( pToken->GetType() == svDouble )
+                    pPar->PutDouble( pToken->GetDouble() );
                 else
                 {
-                    pPar->PutDouble( pToken->GetDouble() );
-                    bOk = true;
+                    SetError( errIllegalArgument );
+                    bOk = false;
                 }
             }
             break;