diff options
| author | Eike Rathke <erack@redhat.com> | 2017-06-15 12:06:00 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-06-15 23:04:21 +0200 |
| commit | 134c9a76690d17a1a8a3c339ef4ef8cbe0b8841d (patch) | |
| tree | 49e0b50a7c80989301c852234d114918dce5ab0c | |
| parent | 5d87b80683513a47d4ed2a9de2ff5477da93cf42 (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
(cherry picked from commit e6abe9c3d06d6776e05bef93b5e6f87b403ea967)
Reviewed-on: https://gerrit.libreoffice.org/38831
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | sc/source/core/tool/interpr7.cxx | 6 |
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: { |