Kaydet (Commit) 968e2faf authored tarafından Eike Rathke's avatar Eike Rathke

Resolves: tdf#95226 fix broken IFERROR/IFNA array logic

Change-Id: I059248659f51746cfc1d06faeaadaf3d645c03d3
üst fcc2415a
......@@ -353,11 +353,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.
......@@ -375,6 +375,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 ));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment