sc/source/core/tool/interpr1.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 465df8ea64b417d02917b2f1ca99f502e8e1c6e8 Author: Eike Rathke <[email protected]> Date: Sat Mar 10 20:34:36 2018 +0100 Resolves: tdf#116324 treat jump empty path as 0 when nested Apparently a fallout from commit 0f45ac20cd2ab2a64c40c7d6850f333cc33feeb0 AuthorDate: Mon Jun 28 11:40:39 2010 -0400 CommitDate: Sat Nov 6 23:40:00 2010 -0400 More on fixing build by eliminating use of ScMatrixValue. or other commits related to ScMatrix handling. Change-Id: I10e8b58aed51cd707b1503dbbc0b369aea4a2805 (cherry picked from commit 8930f8f530b4879226a6bac55bfeb551ac9e7489) Reviewed-on: https://gerrit.libreoffice.org/51383 Reviewed-by: Kohei Yoshida <[email protected]> Reviewed-by: Markus Mohrhard <[email protected]> Tested-by: Markus Mohrhard <[email protected]> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 18a93676fa4a..125efec1b397 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -130,8 +130,10 @@ void ScInterpreter::ScIfJump() else { // Treat empty and empty path as 0, but string - // as error. - bIsValue = (!pMat->IsString(nC, nR) || pMat->IsEmpty(nC, nR)); + // as error. ScMatrix::IsValueOrEmpty() returns + // true for any empty, empty path, empty cell, + // empty result. + bIsValue = pMat->IsValueOrEmpty(nC, nR); bTrue = false; fVal = (bIsValue ? 0.0 : CreateDoubleError( FormulaError::NoValue)); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
