summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-09-16 19:09:17 +0200
committerEike Rathke <erack@redhat.com>2013-09-16 19:12:36 +0200
commit2f2ee162ac521b9ad90651429253b9bf569f1797 (patch)
tree340bedad0acef77c7db1df286aa275d2deac2940 /formula
parent19fd14a8ed09f1ab4c7bf9ae49df3131daea7d51 (diff)
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.
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index d9861cf9a9d2..4cb1164b72d4 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) ||