sc/source/core/tool/interpr1.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 5154b77b88c1b95afb0b2399e765bb3cad9f89fe Author: Eike Rathke <[email protected]> Date: Wed Oct 21 18:45:18 2015 +0200 Resolves: tdf#95226 fix broken IFERROR/IFNA array logic Change-Id: I059248659f51746cfc1d06faeaadaf3d645c03d3 (cherry picked from commit 968e2faff6d4283dacd9010d31cb4c0df45eb7c5) Reviewed-on: https://gerrit.libreoffice.org/19520 Reviewed-by: Caolán McNamara <[email protected]> Reviewed-by: Markus Mohrhard <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index ff8a990..f6caa79 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -354,11 +354,11 @@ void ScInterpreter::ScIfError( bool bNAonly ) SCSIZE nC = 0, nR = 0; for ( ; nC < nCols && (nC != nErrorCol || nR != nErrorRow); /*nop*/ ) { - for ( ; nR < nRows && (nC != nErrorCol || nR != nErrorRow); ++nR) + for (nR = 0 ; nR < nRows && (nC != nErrorCol || nR != nErrorRow); ++nR) { lcl_storeJumpMatResult(pMatPtr, pJumpMat, nC, nR); } - if (nC != nErrorCol || nR != nErrorRow) + if (nC != nErrorCol && nR != nErrorRow) ++nC; } // Now the mixed cases. @@ -376,6 +376,7 @@ void ScInterpreter::ScIfError( bool bNAonly ) lcl_storeJumpMatResult(pMatPtr, pJumpMat, nC, nR); } } + nR = 0; } xNew = new ScJumpMatrixToken( pJumpMat ); GetTokenMatrixMap().insert( ScTokenMatrixMap::value_type( pCur, xNew ));
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
