summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-03-10 20:34:36 +0100
committerEike Rathke <erack@redhat.com>2018-03-10 20:43:02 +0100
commit8930f8f530b4879226a6bac55bfeb551ac9e7489 (patch)
tree6caa50d61c94a2afa23049c00c110f746fb46b91
parent5983cb047ae85d64040b3a99a5bb39a235f4f148 (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
-rw-r--r--sc/source/core/tool/interpr1.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3123ba8fd54f..21fecb197b1e 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));
}