summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/source/core/tool/interpr4.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 72563fd662ce..8688b12c9286 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;