diff options
| author | Eike Rathke <erack@redhat.com> | 2021-12-25 19:38:14 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-12-26 09:01:39 +0100 |
| commit | 07e58ea08758018906c08321591d264f85a24e66 (patch) | |
| tree | d84b0bfbf40c004b4c266250d8886c4d1551437e /sc | |
| parent | df77dcbbb2ecd3a272a3ea55877a1b1c9fd8ef03 (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/+/127477
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sc')
| -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 94923f75c255..cc710efc353e 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -1347,7 +1347,7 @@ void ScInterpreter::ScAnd() } break; default: - Pop(); + PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1446,7 +1446,7 @@ void ScInterpreter::ScOr() } break; default: - Pop(); + PopError(); SetError( FormulaError::IllegalParameter); } } @@ -1548,7 +1548,7 @@ void ScInterpreter::ScXor() } break; default: - Pop(); + PopError(); SetError( FormulaError::IllegalParameter); } } |