formula/source/core/api/FormulaCompiler.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2f2ee162ac521b9ad90651429253b9bf569f1797
Author: Eike Rathke <er...@redhat.com>
Date: Mon Sep 16 19:09:17 2013 +0200
Revert "get rid of unnecessary warning"
This reverts commit e5321437322fd812b93fee266af309e782479488.
OpCode 0 (ocPush) was deliberately included in the assertion as it is
never a mapping to a function or operator name.
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index d9861cf..4cb1164 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( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out
of range");
- if (sal_uInt16(eOp) < mnSymbols)
+ DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode:
OpCode out of range");
+ if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
{
DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) ||
(eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) ||
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
