summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-05-20 14:10:55 +0200
committerMichael Stahl <mstahl@redhat.com>2015-05-20 21:13:41 +0200
commite29a17ede22aee2fcc5e17f945c3e69d1927e7c1 (patch)
tree53cc113a71791de2abcea2453b359405fdf9a045
parenta80da8e6558048239de977b665a58e62423c1f65 (diff)
xmloff: convert legacy assertions in SvXMLNamespaceMap
Change-Id: I9771bf3b727168bad6aeb07a2eb55eb08b1b6408
-rw-r--r--xmloff/source/core/nmspmap.cxx14
1 files changed, 5 insertions, 9 deletions
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index e41fb921437b..78cf02744bce 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <tools/debug.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
@@ -103,8 +102,7 @@ sal_uInt16 SvXMLNamespaceMap::Add( const OUString& rPrefix, const OUString& rNam
if( XML_NAMESPACE_UNKNOWN == nKey )
nKey = GetKeyByName( rName );
- DBG_ASSERT( XML_NAMESPACE_NONE != nKey,
- "SvXMLNamespaceMap::Add: invalid namespace key" );
+ assert(XML_NAMESPACE_NONE != nKey);
if( XML_NAMESPACE_NONE == nKey )
return USHRT_MAX;
@@ -119,8 +117,7 @@ sal_uInt16 SvXMLNamespaceMap::AddIfKnown( const OUString& rPrefix, const OUStrin
{
sal_uInt16 nKey = GetKeyByName( rName );
- DBG_ASSERT( XML_NAMESPACE_NONE != nKey,
- "SvXMLNamespaceMap::AddIfKnown: invalid namespace key" );
+ assert(XML_NAMESPACE_NONE);
if( XML_NAMESPACE_NONE == nKey )
return XML_NAMESPACE_UNKNOWN;
@@ -197,7 +194,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
{
case XML_NAMESPACE_UNKNOWN:
// ...if it's a completely unknown namespace, assert and return the local name
- DBG_ASSERT( false, "SvXMLNamespaceMap::GetQNameByKey: invalid namespace key" );
+ assert(false);
case XML_NAMESPACE_NONE:
// ...if there isn't one, return the local name
return rLocalName;
@@ -260,7 +257,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey,
else
{
// ... if it isn't, this is a Bad Thing, assert and return the local name
- DBG_ASSERT( false, "SvXMLNamespaceMap::GetQNameByKey: invalid namespace key" );
+ assert(false);
return rLocalName;
}
}
@@ -387,8 +384,7 @@ bool SvXMLNamespaceMap::AddAtIndex( sal_uInt16 /*nIdx*/, const OUString& rPrefix
if( XML_NAMESPACE_UNKNOWN == nKey )
nKey = GetKeyByName( rName );
- DBG_ASSERT( XML_NAMESPACE_NONE != nKey,
- "SvXMLNamespaceMap::AddAtIndex: invalid namespace key" );
+ assert(XML_NAMESPACE_NONE != nKey);
if( XML_NAMESPACE_NONE != nKey && ! ( aNameHash.count ( rPrefix ) ) )
{
_Add( rPrefix, rName, nKey );