summaryrefslogtreecommitdiff
path: root/xmloff/inc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-05-18 13:39:00 +0200
committerMichael Stahl <mstahl@redhat.com>2015-05-18 14:49:15 +0200
commit227be0d87edcc3b92b90ccb4c0678d376d1dd6d4 (patch)
tree8f2a122b8ff9f43d63acbd3772e0a20c3ed22418 /xmloff/inc
parent42773c66d0239eccd4ad147c61c931b98fc9f5f0 (diff)
xmloff: convert legacy asserts in MultiPropertySetHelper
Change-Id: Ie4fb04d1c8d29eb5c7d9da4076c793a69954ab29
Diffstat (limited to 'xmloff/inc')
-rw-r--r--xmloff/inc/MultiPropertySetHelper.hxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx b/xmloff/inc/MultiPropertySetHelper.hxx
index 8467c16e6b6f..f6a248d33ddb 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -172,11 +172,9 @@ public:
const ::com::sun::star::uno::Any& MultiPropertySetHelper::getValue(
sal_Int16 nValueNo )
{
- DBG_ASSERT( pValues != NULL,
- "called getValue() without calling getValues() before");
- DBG_ASSERT( pSequenceIndex != NULL,
- "called getValue() without calling hasProperties() before" );
- DBG_ASSERT( nValueNo < nLength, "index out of range" );
+ assert(pValues && "called getValue() without calling getValues()");
+ assert(pSequenceIndex && "called getValue() without calling hasProperties()");
+ assert(nValueNo < nLength);
sal_Int16 nIndex = pSequenceIndex[ nValueNo ];
return ( nIndex != -1 ) ? pValues[ nIndex ] : aEmptyAny;
@@ -184,9 +182,8 @@ const ::com::sun::star::uno::Any& MultiPropertySetHelper::getValue(
bool MultiPropertySetHelper::hasProperty( sal_Int16 nValueNo )
{
- DBG_ASSERT( pSequenceIndex != NULL,
- "called getValue() without calling hasProperties() before" );
- DBG_ASSERT( nValueNo < nLength, "index out of range" );
+ assert(pSequenceIndex && "called hasProperty() without calling hasProperties()");
+ assert(nValueNo < nLength);
return pSequenceIndex[ nValueNo ] != -1;
}