Kaydet (Commit) 42773c66 authored tarafından Michael Stahl's avatar Michael Stahl

xmloff: convert legacy assertions in xmltoken.cxx

Change-Id: I852e6a6d805cc03920a467bf7f9739181b6c77d4
üst 3ccacb47
...@@ -3281,11 +3281,11 @@ namespace xmloff { namespace token { ...@@ -3281,11 +3281,11 @@ namespace xmloff { namespace token {
s_bChecked = true; // it's all static, checking once is enough s_bChecked = true; // it's all static, checking once is enough
} }
#endif #endif
DBG_ASSERT( eToken > XML_TOKEN_INVALID, "token value too low!" ); assert(XML_TOKEN_INVALID < eToken);
DBG_ASSERT( eToken < XML_TOKEN_END, "token value too high!" ); assert(eToken < XML_TOKEN_END);
DBG_ASSERT(sal_uInt16(eToken) < sizeof(aTokenList)/sizeof(aTokenList[0]),"Illegal position!"); 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) if (!pToken->pOUString)
pToken->pOUString = new OUString( pToken->pChar, pToken->nLength, pToken->pOUString = new OUString( pToken->pChar, pToken->nLength,
RTL_TEXTENCODING_ASCII_US ); RTL_TEXTENCODING_ASCII_US );
...@@ -3297,8 +3297,8 @@ namespace xmloff { namespace token { ...@@ -3297,8 +3297,8 @@ namespace xmloff { namespace token {
const OUString& rString, const OUString& rString,
enum XMLTokenEnum eToken ) enum XMLTokenEnum eToken )
{ {
DBG_ASSERT( eToken > XML_TOKEN_INVALID, "token value too low!" ); assert(XML_TOKEN_INVALID < eToken);
DBG_ASSERT( eToken < XML_TOKEN_END, "token value too high!" ); assert(eToken < XML_TOKEN_END);
const XMLTokenEntry* pToken = &aTokenList[(sal_uInt16)eToken]; const XMLTokenEntry* pToken = &aTokenList[(sal_uInt16)eToken];
return rString.equalsAsciiL( pToken->pChar, pToken->nLength ); return rString.equalsAsciiL( pToken->pChar, pToken->nLength );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment