diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-04-16 12:47:46 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-21 12:24:01 +0200 |
| commit | d8d1491b44f5e4522aaa81eea7dca2d320267614 (patch) | |
| tree | afe7e72e4032d38bfb1171f7b87b93aaab2775d1 | |
| parent | Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi (diff) | |
| download | core-d8d1491b44f5e4522aaa81eea7dca2d320267614.tar.gz core-d8d1491b44f5e4522aaa81eea7dca2d320267614.zip | |
tdf#130583: fix Switch in Calc
Don't set bFinished to true too soon if there are still some params to take into account
Change-Id: Ie7bdd6f316c08342d379d55bf3853774dd738e7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92345
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit bb3ea0ae51bb943f7bb3dca80eee153f9c55c03e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92433
(cherry picked from commit c30b664f910ed980b4bf7c96f0ed23fe1d8be8e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92434
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sc/source/core/tool/interpr8.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 0fa198c6ebb6..0216ce337759 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1965,7 +1965,7 @@ void ScInterpreter::ScSwitch_MS() else aStr = GetString(); nParamCount--; - if ( nGlobalError != FormulaError::NONE || (( isValue && rtl::math::approxEqual( fRefVal, fVal ) ) || + if ( (nGlobalError != FormulaError::NONE && nParamCount < 2) || (( isValue && rtl::math::approxEqual( fRefVal, fVal ) ) || ( !isValue && aRefStr.getDataIgnoreCase() == aStr.getDataIgnoreCase() )) ) { // TRUE |