diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-05-18 14:35:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-05-18 14:49:18 +0200 |
| commit | 4b08e98630f3ff81879b787f6597f1f8401bbad8 (patch) | |
| tree | 1594d9157336774f92c547437554a65904e316e1 /xmloff/source | |
| parent | f7f48dd4bb8c20d9165b13f79df25da5f2e27bc8 (diff) | |
xmloff: convert legacy assertions in SvXMLAutoStylePoolP
Change-Id: Ibf3afcfb3f4dc400faa18a726ec47d58a230de65
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/style/xmlaustp.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index b541766ac6e6..0a8e22e1f2f5 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -44,11 +44,11 @@ namespace static void lcl_exportDataStyle( SvXMLExport& _rExport, const rtl::Reference< XMLPropertySetMapper >& _rxMapper, const XMLPropertyState& _rProperty ) { - DBG_ASSERT( _rxMapper.is(), "xmloff::lcl_exportDataStyle: invalid property mapper!" ); + assert(_rxMapper.is()); // obtain the data style name OUString sDataStyleName; _rProperty.maValue >>= sDataStyleName; - DBG_ASSERT( !sDataStyleName.isEmpty(), "xmloff::lcl_exportDataStyle: invalid property value for the data style name!" ); + assert(!sDataStyleName.isEmpty() && "xmloff::lcl_exportDataStyle: invalid property value for the data style name!"); // add the attribute _rExport.AddAttribute( @@ -88,7 +88,7 @@ void SvXMLAutoStylePoolP::exportStyleAttributes( if( (XML_STYLE_FAMILY_SD_GRAPHICS_ID == nFamily) || (XML_STYLE_FAMILY_SD_PRESENTATION_ID == nFamily) ) { // it's a graphics style rtl::Reference< XMLPropertySetMapper > aPropertyMapper = rPropExp.getPropertySetMapper(); - DBG_ASSERT(aPropertyMapper.is(), "SvXMLAutoStylePoolP::exportStyleAttributes: invalid property set mapper!"); + assert(aPropertyMapper.is()); bool bFoundControlShapeDataStyle = false; bool bFoundNumberingRulesName = false; @@ -322,8 +322,7 @@ void SvXMLAutoStylePoolP::RegisterNames( uno::Sequence<sal_Int32>& aFamilies, uno::Sequence<OUString>& aNames ) { - DBG_ASSERT( aFamilies.getLength() == aNames.getLength(), - "aFamilies != aNames" ); + assert(aFamilies.getLength() == aNames.getLength()); // iterate over sequence(s) and call RegisterName(..) for each pair const sal_Int32* pFamilies = aFamilies.getConstArray(); |