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

Winfried Donkers winfrieddonkers at libreoffice.org
Tue Aug 27 06:48:28 PDT 2013


 formula/source/core/api/FormulaCompiler.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5321437322fd812b93fee266af309e782479488
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date:   Thu Aug 22 17:03:58 2013 +0200

    get rid of unnecessary warning
    
    A value of 0 for Opcode eOp produces a debug assertion that is
    not in place as opcode with value does exist (ocPush, SC_OPCODE_PUSH).
    
    Change-Id: If529cc2ecd8d4d3a5e31f084dfa72e13c9c0fe37
    Reviewed-on: https://gerrit.libreoffice.org/5586
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Tested-by: Thorsten Behrens <tbehrens at suse.com>

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index 4cb1164..d9861cf 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -488,8 +488,8 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create
 
 void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eOp )
 {
-    DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
-    if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
+    DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range");
+    if (sal_uInt16(eOp) < mnSymbols)
     {
         DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) ||
             (eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) ||


More information about the Libreoffice-commits mailing list