[Libreoffice-commits] core.git: formula/source

Winfried Donkers winfrieddonkers at libreoffice.org
Mon Apr 4 07:26:18 UTC 2016


 formula/source/core/api/FormulaCompiler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 62967a0afc596811fe308640acdd90a6df57185f
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Mon Apr 4 08:04:35 2016 +0200

    get rid of a TODO comment
    
    Checked if the < is correct. It is.
    Calc function Choose has 1 index argument plus up to 30 value-arguments,
    so the maximum argument count is 31.
    FORMULA_MAXJUMPCOUNT is 32.
    
    Change-Id: I0bc8cc122902848dadfc92d56b6f06fbec43e4be
    Reviewed-on: https://gerrit.libreoffice.org/23794
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 2560e39..fbf800a 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1490,7 +1490,7 @@ void FormulaCompiler::Factor()
                         bLimitOk = (nJumpCount <= 3);
                         break;
                     case ocChoose:
-                        bLimitOk = (nJumpCount < FORMULA_MAXJUMPCOUNT); /* TODO: check, really <, not <=? */
+                        bLimitOk = (nJumpCount < FORMULA_MAXJUMPCOUNT);
                         break;
                     case ocIfError:
                     case ocIfNA:


More information about the Libreoffice-commits mailing list