diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-04-13 15:23:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-04-13 15:23:53 +0100 |
| commit | efdf9eff81cb9214c14f719a72b769c136ed4b74 (patch) | |
| tree | e62d5da36f3ea104aab28ff1513276760feccebb /formula | |
| parent | default to UTF8 for html encoding (diff) | |
| download | core-efdf9eff81cb9214c14f719a72b769c136ed4b74.tar.gz core-efdf9eff81cb9214c14f719a72b769c136ed4b74.zip | |
dont' assert for changing seperators, common thing to do
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index bd38fca34798..5ac4aba165ab 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -489,7 +489,9 @@ void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eO 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), + DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) || + (eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) || + (eOp == ocArrayRowSep), ByteString( "OpCodeMap::putOpCode: reusing OpCode "). Append( ByteString::CreateFromInt32( sal_Int32( eOp))).Append( " ("). Append( ByteString( rStr, RTL_TEXTENCODING_ASCII_US)).Append( ')').GetBuffer()); |