| commit | f075eaf3e6e4244cb7b92420e4286848bf22ed91 | [log] |
|---|---|---|
| author | Julien Nabet <serval2412@yahoo.fr> | Thu Apr 16 12:47:46 2020 +0200 |
| committer | Eike Rathke <erack@redhat.com> | Fri Apr 17 21:23:38 2020 +0200 |
| tree | f07145dc4b645df77e0b6b2c1403afa74c538f38 | |
| parent | 9088a1bac800d1fec7eb0a4102a47c17235b429e [diff] |
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/+/92432
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index 18a65e8..71269e9 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