sc/source/core/tool/interpr8.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit d8d1491b44f5e4522aaa81eea7dca2d320267614 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Thu Apr 16 12:47:46 2020 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Tue Apr 21 12:24:01 2020 +0200 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 <er...@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.st...@cib.de> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits