diff options
| author | Eike Rathke <erack@redhat.com> | 2018-03-10 20:34:36 +0100 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2018-03-21 12:34:49 +0100 |
| commit | 4100c987f7c73a2e90ee8747ebc845478deff82e (patch) | |
| tree | 17d5edcdd5a8875cb508fa88f5dc5713096ef599 /sc | |
| parent | 4f7250d4bb2b86b1d50e27a72af9bb4d7b01c66a (diff) | |
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/51054
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index f40637f33540..666e27ebc156 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -131,8 +131,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)); } |