diff options
| author | Eike Rathke <erack@redhat.com> | 2021-12-25 19:38:14 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-12-25 23:20:45 +0100 |
| commit | eb050ea5b004e2f4a6ba96474177251f678707e9 (patch) | |
| tree | 37628bae2cfd5cb48c5a24a0b35d639ef845685a /sc/source | |
| parent | 8d95c59b79516fe1eab0fd8612962470bce303e1 (diff) | |
Related: tdf#146377 Let AND(), OR(), XOR() propagate the current error, if any
... instead of forcing Err:504
Change-Id: I7e91671ffc61bf82d9095378656b41981040f55e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127492
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 4674ff347cd2e71445503efdc0c110d094daa80b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127476
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/tool/interpr1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index fae8a6eeb222..345ab7115815 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -1342,7 +1342,7 @@ void ScInterpreter::ScAnd() } break; default: - Pop(); + PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1441,7 +1441,7 @@ void ScInterpreter::ScOr() } break; default: - Pop(); + PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1543,7 +1543,7 @@ void ScInterpreter::ScXor() } break; default: - Pop(); + PopError(); SetError( FormulaError::IllegalParameter); } } |