sc/source/core/tool/interpr4.cxx | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
New commits: commit bfd51e38599d717a3c1b19acd882b52175dd3d09 Author: Eike Rathke <er...@redhat.com> Date: Wed Oct 7 20:56:23 2015 +0200 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 (cherry picked from commit 934e47958c78d1184beaaefdf3baefd3eecbea05) Reviewed-on: https://gerrit.libreoffice.org/19235 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 9d4821c..e351743 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -1082,7 +1082,7 @@ double ScInterpreter::PopDouble() } else SetError( errUnknownStackVariable); - return 0.0; + return CreateDoubleError( nGlobalError); } svl::SharedString ScInterpreter::PopString() @@ -2186,7 +2186,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 ); @@ -2199,7 +2202,7 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat) return pMat->GetDouble( nC, nR); SetError( errNoValue); - return 0.0; + return CreateDoubleError( nGlobalError); } double ScInterpreter::GetDouble() @@ -2233,8 +2236,6 @@ double ScInterpreter::GetDouble() aCell.assign(*pDok, aAdr); nVal = GetCellValue(aAdr, aCell); } - else - nVal = 0.0; } break; case svExternalSingleRef: @@ -2263,7 +2264,6 @@ double ScInterpreter::GetDouble() break; case svError: PopError(); - nVal = 0.0; break; case svEmptyCell: case svMissing: @@ -2273,8 +2273,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;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits