summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-05-18 14:09:29 +0200
committerMichael Stahl <mstahl@redhat.com>2015-05-18 14:49:17 +0200
commit9beae152a30baeab8d2d461410d83de1c7c1f7f2 (patch)
tree0f95ca16eca7a5c96ed2943e7dbf207594cd58e0 /xmloff
parentce0ed76f5a8cb3efe61a6d483e43b1f363b6080d (diff)
xmloff: convert legacy assertions in SvXMLAutoStylePoolP_Impl::exportXML
Change-Id: I9f21ad73a8a30e0b9d0d515713cc95b303f973f7
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/style/impastpl.cxx18
1 files changed, 6 insertions, 12 deletions
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 03123868ae9b..a2a34ff7a824 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -484,7 +484,7 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
}
// copy the families + names into the sequence types
- DBG_ASSERT( aFamilies.size() == aNames.size(), "families != names" );
+ assert(aFamilies.size() == aNames.size());
rFamilies.realloc( aFamilies.size() );
std::copy( aFamilies.begin(), aFamilies.end(), rFamilies.getArray() );
@@ -638,15 +638,10 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
XMLAutoStylePoolProperties* pProperties =
&rParent.GetPropertiesList()[j];
sal_uLong nPos = pProperties->GetPos();
- DBG_ASSERT( nPos < nCount,
- "SvXMLAutoStylePool_Impl::exportXML: wrong position" );
- if( nPos < nCount )
- {
- DBG_ASSERT( !aExpStyles[nPos].mpProperties,
- "SvXMLAutoStylePool_Impl::exportXML: double position" );
- aExpStyles[nPos].mpProperties = pProperties;
- aExpStyles[nPos].mpParent = &rParent.GetParent();
- }
+ assert(nPos < nCount);
+ assert(!aExpStyles[nPos].mpProperties);
+ aExpStyles[nPos].mpProperties = pProperties;
+ aExpStyles[nPos].mpParent = &rParent.GetParent();
}
}
@@ -674,8 +669,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
for( size_t i = 0; i < nCount; i++ )
{
- DBG_ASSERT( aExpStyles[i].mpProperties,
- "SvXMLAutoStylePool_Impl::exportXML: empty position" );
+ assert(aExpStyles[i].mpProperties);
if( aExpStyles[i].mpProperties )
{