formula/source/core/api/FormulaCompiler.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit c1ea4a0dd92de814c8f07d06bd39a59f8b33a920 Author: Caolán McNamara <caol...@redhat.com> Date: Sun Jan 4 16:20:27 2015 +0000 help out clang Change-Id: I21c1f43f4e0c339c57fa0f8f177eac8811ea0a4e diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index cda306e..f5b1b9a 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -515,7 +515,7 @@ void FormulaCompiler::OpCodeMap::putOpCode( const OUString & rStr, const OpCode SAL_WARN_IF( !(mpTable[eOp].isEmpty() || (mpTable[eOp] == rStr) || (eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) || (eOp == ocArrayRowSep)), "formula.core", - "OpCodeMap::putOpCode: reusing OpCode " << eOp + "OpCodeMap::putOpCode: reusing OpCode " << static_cast<sal_uInt16>(eOp) << ", replacing '" << mpTable[eOp] << "' with '" << rStr << "' in " << (mbEnglish ? "" : "non-") << "English map 0x" << ::std::hex << meGrammar); mpTable[eOp] = rStr; @@ -877,7 +877,8 @@ FormulaCompiler::OpCodeMap::~OpCodeMap() void FormulaCompiler::OpCodeMap::putCopyOpCode( const OUString& rSymbol, OpCode eOp ) { SAL_WARN_IF( !mpTable[eOp].isEmpty() && rSymbol.isEmpty(), "formula.core", - "OpCodeMap::putCopyOpCode: NOT replacing OpCode " << eOp << " '" << mpTable[eOp] << "' with empty name!"); + "OpCodeMap::putCopyOpCode: NOT replacing OpCode " << static_cast<sal_uInt16>(eOp) + << " '" << mpTable[eOp] << "' with empty name!"); if (!mpTable[eOp].isEmpty() && rSymbol.isEmpty()) mpHashMap->insert( OpCodeHashMap::value_type( mpTable[eOp], eOp)); else
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits