diff options
author | Eike Rathke <erack@redhat.com> | 2015-10-07 20:56:23 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2015-10-07 21:01:21 +0200 |
commit | 934e47958c78d1184beaaefdf3baefd3eecbea05 (patch) | |
tree | 8255fe291863aeef637f78f7c206c7651dc8537e /sc | |
parent | 99b935ff7dd069f2a0aad5054d07bc6f71411d84 (diff) |
Resolves: tdf#94869 propagate error when obtaining a scalar double value
... if any operation like popping a value or calculating an intersection
resulted in error, so the error gets passed as double error to matrix
operations where one operand is a scalar value.
Change-Id: I909ba25545625b827ce790e07d1ebe8643154703
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/core/tool/interpr4.cxx | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e8a3b1d454aa..69d13cbdbef6 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -821,7 +821,7 @@ double ScInterpreter::PopDouble() } else SetError( errUnknownStackVariable); - return 0.0; + return CreateDoubleError( nGlobalError); } svl::SharedString ScInterpreter::PopString() @@ -1925,7 +1925,10 @@ bool ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat) { if (!pMat) - return 0.0; + { + SetError( errParameterExpected); + return CreateDoubleError( nGlobalError); + } if ( !pJumpMatrix ) return pMat->GetDouble( 0 ); @@ -1938,7 +1941,7 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat) return pMat->GetDouble( nC, nR); SetError( errNoValue); - return 0.0; + return CreateDoubleError( nGlobalError); } double ScInterpreter::GetDouble() @@ -1972,8 +1975,6 @@ double ScInterpreter::GetDouble() aCell.assign(*pDok, aAdr); nVal = GetCellValue(aAdr, aCell); } - else - nVal = 0.0; } break; case svExternalSingleRef: @@ -2002,7 +2003,6 @@ double ScInterpreter::GetDouble() break; case svError: PopError(); - nVal = 0.0; break; case svEmptyCell: case svMissing: @@ -2012,8 +2012,16 @@ double ScInterpreter::GetDouble() default: PopError(); SetError( errIllegalParameter); - nVal = 0.0; } + + // Propagate error also as double error, so matrix operations where one + // operand is a scalar get that propagated if there is no specific + // nGlobalError check, and when the matrix is pushed the error is cleared + // because the matrix is assumed to hold double errors at the corresponding + // positions. See PushMatrix(). + if (nGlobalError) + nVal = CreateDoubleError( nGlobalError); + if ( nFuncFmtType == nCurFmtType ) nFuncFmtIndex = nCurFmtIndex; return nVal; |