summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-06-15 12:06:00 +0200
committerEike Rathke <erack@redhat.com>2017-06-15 12:06:42 +0200
commite6abe9c3d06d6776e05bef93b5e6f87b403ea967 (patch)
treee354310f146f9a0d1f8ecee72ec9b6c66bf55f64
parent3459f778012d376e746be442167e2b85de18d6cc (diff)
Ensure all cases push an error return, tdf#104989 related (not the cause)
A formula cell in matrix context could have no dimensions.. (which is the cause but elsewhere). Change-Id: I1a04f9808d8f5c802789e3db77052351b24c24c7
-rw-r--r--sc/source/core/tool/interpr7.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index 8b3e5375545b..0d8af3173ed2 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -83,6 +83,11 @@ void ScInterpreter::ScFilterXML()
}
}
+ if (!nMatCols || !nMatRows)
+ {
+ PushNoValue();
+ return;
+ }
OUString aXPathExpression = GetString().getString();
OUString aString = GetString().getString();
@@ -124,6 +129,7 @@ void ScInterpreter::ScFilterXML()
switch(pXPathObj->type)
{
case XPATH_UNDEFINED:
+ PushNoValue();
break;
case XPATH_NODESET:
{