sc/source/core/tool/interpr7.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit e6abe9c3d06d6776e05bef93b5e6f87b403ea967
Author: Eike Rathke <er...@redhat.com>
Date: Thu Jun 15 12:06:00 2017 +0200
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
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:
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
