diff options
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 926866d094cb..62e28c31dd3c 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3209,6 +3209,22 @@ void ScInterpreter::ScMacro() case svString: pPar->PutString( GetString() ); break; + case svExternalSingleRef: + { + ScExternalRefCache::TokenRef pToken; + PopExternalSingleRef(pToken); + if ( nGlobalError ) + { + SetError( errIllegalArgument); + bOk = false; + } + else + { + pPar->PutDouble( pToken->GetDouble() ); + bOk = true; + } + } + break; case svSingleRef: { ScAddress aAdr; @@ -3269,11 +3285,16 @@ void ScInterpreter::ScMacro() } } break; + case svExternalDoubleRef: case svMatrix: { - ScMatrixRef pMat = PopMatrix(); + ScMatrixRef pMat; + if (nStackType == svMatrix) + pMat = PopMatrix(); + else + PopExternalDoubleRef(pMat); SCSIZE nC, nR; - if (pMat) + if (pMat && !nGlobalError) { pMat->GetDimensions(nC, nR); SbxDimArrayRef refArray = new SbxDimArray; |