From 42773c66d0239eccd4ad147c61c931b98fc9f5f0 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Mon, 18 May 2015 13:25:06 +0200
Subject: xmloff: convert legacy assertions in xmltoken.cxx
Change-Id: I852e6a6d805cc03920a467bf7f9739181b6c77d4
---
xmloff/source/core/xmltoken.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'xmloff/source')
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index e242f8cc9ef3..b22c1acce855 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3281,11 +3281,11 @@ namespace xmloff { namespace token {
s_bChecked = true; // it's all static, checking once is enough
}
#endif
- DBG_ASSERT( eToken > XML_TOKEN_INVALID, "token value too low!" );
- DBG_ASSERT( eToken < XML_TOKEN_END, "token value too high!" );
- DBG_ASSERT(sal_uInt16(eToken) < sizeof(aTokenList)/sizeof(aTokenList[0]),"Illegal position!");
+ assert(XML_TOKEN_INVALID < eToken);
+ assert(eToken < XML_TOKEN_END);
+ assert(sal_uInt16(eToken) < SAL_N_ELEMENTS(aTokenList));
- XMLTokenEntry* pToken = &aTokenList[(sal_uInt16)eToken];
+ XMLTokenEntry* pToken = &aTokenList[static_cast<sal_uInt16>(eToken)];
if (!pToken->pOUString)
pToken->pOUString = new OUString( pToken->pChar, pToken->nLength,
RTL_TEXTENCODING_ASCII_US );
@@ -3297,8 +3297,8 @@ namespace xmloff { namespace token {
const OUString& rString,
enum XMLTokenEnum eToken )
{
- DBG_ASSERT( eToken > XML_TOKEN_INVALID, "token value too low!" );
- DBG_ASSERT( eToken < XML_TOKEN_END, "token value too high!" );
+ assert(XML_TOKEN_INVALID < eToken);
+ assert(eToken < XML_TOKEN_END);
const XMLTokenEntry* pToken = &aTokenList[(sal_uInt16)eToken];
return rString.equalsAsciiL( pToken->pChar, pToken->nLength );
--
cgit