diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:06:20 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:06:20 +0100 |
| commit | c815f972183ac80ed52fb16e3480677e78f07bc6 (patch) | |
| tree | 01f33a4f4662afa0a89f7711c06a40a67ce6232f /formula | |
| parent | 16419e7a08fc3b2f931e0831845e646d4cb40dda (diff) | |
removetooltypes01: #i112600# Fix build problems on non-pro
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/inc/formula/FormulaCompiler.hxx | 2 | ||||
| -rw-r--r-- | formula/source/core/api/FormulaCompiler.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index ef618e52a5..29c15dea9a 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -135,7 +135,7 @@ public: /// Get the symbol string matching an OpCode. inline const String& getSymbol( const OpCode eOp ) const { - DBG_ASSERT( USHORT(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range"); + DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::getSymbol: OpCode out of range"); if (sal_uInt16(eOp) < mnSymbols) return mpTable[ eOp ]; static String s_sEmpty; diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 4a829104bb..8396ebd5b2 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -490,7 +490,7 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > FormulaCompiler::OpCodeMap::create void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eOp ) { - DBG_ASSERT( 0 < eOp && USHORT(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of range"); + 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), |