diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 10:13:21 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 10:13:21 +1000 |
commit | 9cf1ea364ae57ae3e27fef0896d9552fe9e83e1a (patch) | |
tree | facdf7a92fd16c3d5c2c408dd9ae90cb8e604c11 /xmloff | |
parent | 74fa31e12355a45476458d0e6f907894bf4793cd (diff) |
tdf#43157: convert xmloff module away from OSL_ASSERT to assert
Change-Id: I7eb36a11a7de5f7cf35ce97b59c8b461b64385a7
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/SchXMLChartContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/core/attrlist.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 8e264843e2dd..13797e9c92e9 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -972,7 +972,7 @@ void SchXMLChartContext::EndElement() void SchXMLChartContext::MergeSeriesForStockChart() { - OSL_ASSERT( mbIsStockChart ); + assert( mbIsStockChart ); try { uno::Reference< chart::XChartDocument > xOldDoc( mrImportHelper.GetChartDocument()); @@ -1009,7 +1009,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() const sal_Int32 nSeriesCount( aSeriesSeq.getLength()); const sal_Int32 nSeriesPerCandleStick = bHasJapaneseCandlestick ? 4: 3; sal_Int32 nCandleStickCount = nSeriesCount / nSeriesPerCandleStick; - OSL_ASSERT( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount ); + assert( nSeriesPerCandleStick * nCandleStickCount == nSeriesCount ); uno::Sequence< uno::Reference< chart2::XDataSeries > > aNewSeries( nCandleStickCount ); for( sal_Int32 i=0; i<nCandleStickCount; ++i ) { @@ -1120,7 +1120,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( !msColTrans.isEmpty() ) { - OSL_ASSERT( msRowTrans.isEmpty() ); + assert( msRowTrans.isEmpty() ); pTableContext->setColumnPermutation( lcl_getNumberSequenceFromString( msColTrans, true )); msColTrans.clear(); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 35f4a3ffd0be..2ef90c0afe79 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2896,7 +2896,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( const awt::Size& rPageSize, bool bExportContent ) { - OSL_ASSERT( mxExpPropMapper.is()); + assert( mxExpPropMapper.is()); std::vector< XMLPropertyState > aPropertyStates; std::vector< XMLPropertyState > aEquationPropertyStates; diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index 4cd94a6d768b..ac59cb9f1409 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -160,7 +160,7 @@ void SvXMLAttributeList::Clear() { m_pImpl->vecAttribute.clear(); - OSL_ASSERT( ! getLength() ); + assert( ! getLength() ); } void SvXMLAttributeList::RemoveAttribute( const OUString& sName ) @@ -177,7 +177,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString& sName ) void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sax::XAttributeList > &r ) { - OSL_ASSERT( r.is() ); + assert( r.is() ); sal_Int16 nMax = r->getLength(); SvXMLAttributeList_Impl::size_type nTotalSize = @@ -190,7 +190,7 @@ void SvXMLAttributeList::AppendAttributeList( const uno::Reference< css::xml::sa r->getValueByIndex( i ))); } - OSL_ASSERT( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength()); + assert( nTotalSize == (SvXMLAttributeList_Impl::size_type)getLength()); } void SvXMLAttributeList::SetValueByIndex( sal_Int16 i, |