From bb3ea0ae51bb943f7bb3dca80eee153f9c55c03e Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Thu, 16 Apr 2020 12:47:46 +0200 Subject: 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 --- sc/source/core/tool/interpr8.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sc/source/core') diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 1849ab13e6c9..ce978ea094a6 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1974,7 +1974,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 -- cgit v1.2.3