summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-07-10 14:19:05 +0100
committerNoel Power <noel.power@suse.com>2013-07-10 14:20:29 +0100
commit35f9cd513d6dd796a5bc54c51df3961a674addcb (patch)
tree95f2c47e3ef4d484cf200b91c0da9f6eb8934be9
parent8a4307e4bb0eab3dd0a2a82c1fd4b2eab5df9a2e (diff)
additionally handle string types for ScMacro dealing with svExternalSingleRef
Change-Id: Ib0e5077f58fa8d3918433e18e8815fd13fdc6391
-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;