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

[Luboš Luňák (via logerrit)]

 sc/source/core/tool/compiler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1c1195a09e62d37ad5cd93709d7e2b72466c22b3
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Thu Sep 22 09:55:12 2022 +0200
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Thu Sep 22 18:00:35 2022 +0200

    ocAnd/ocOr are not actually binary operators
    
    They are listed in the SC_OPCODE_START_BIN_OP group, but AND(A1:A30)
    is fine.
    
    Change-Id: I397d1f8dc6bff450116dd46b6b1da7ffe447efb7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140372
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index fc97ae0a6bf7..e310794d1297 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -6185,7 +6185,8 @@ bool ScCompiler::HandleIIOpCodeInternal(FormulaToken* 
token, FormulaToken*** ppp
         mPendingImplicitIntersectionOptimizations.emplace_back( pppToken[0], 
token );
         return true;
     }
-    else if ((nOpCode >= SC_OPCODE_START_BIN_OP && nOpCode < 
SC_OPCODE_STOP_BIN_OP)
+    else if ((nOpCode >= SC_OPCODE_START_BIN_OP && nOpCode < 
SC_OPCODE_STOP_BIN_OP
+                && nOpCode != ocAnd && nOpCode != ocOr)
               || nOpCode == ocRound || nOpCode == ocRoundUp || nOpCode == 
ocRoundDown)
     {
         if (nNumParams != 2)