diff options
| -rw-r--r-- | unoxml/source/dom/attr.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/dom/document.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/dom/node.cxx | 4 | ||||
| -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 |
6 files changed, 15 insertions, 15 deletions
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 39cb53230c9a..64ccfd51e276 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -217,7 +217,7 @@ namespace DOM if (!m_aNodePtr) { return; } if (m_pNamespace.get()) { - OSL_ASSERT(!m_aNodePtr->parent); + assert(!m_aNodePtr->parent); m_pNamespace->second = OUStringToOString(prefix, RTL_TEXTENCODING_UTF8); } else { @@ -232,7 +232,7 @@ namespace DOM if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { - OSL_ASSERT(!m_aNodePtr->parent); + assert(!m_aNodePtr->parent); OUString const ret(OStringToOUString( m_pNamespace->second, RTL_TEXTENCODING_UTF8)); return ret; @@ -248,7 +248,7 @@ namespace DOM if (!m_aNodePtr) { return OUString(); } if (m_pNamespace.get()) { - OSL_ASSERT(!m_aNodePtr->parent); + assert(!m_aNodePtr->parent); OUString const ret(OStringToOUString( m_pNamespace->first, RTL_TEXTENCODING_UTF8)); return ret; diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx index b9c167ee2486..77ccebffa426 100644 --- a/unoxml/source/dom/document.cxx +++ b/unoxml/source/dom/document.cxx @@ -173,7 +173,7 @@ namespace DOM if (xNode.is()) { ::rtl::Reference<CNode> ret(i->second.second); - OSL_ASSERT(ret.is()); + assert(ret.is()); return ret; } } @@ -265,7 +265,7 @@ namespace DOM ::std::make_pair(WeakReference<XNode>(pCNode.get()), pCNode.get())) ).second; - OSL_ASSERT(bInserted); + assert(bInserted); if (!bInserted) { // if insertion failed, delete new instance and return null return nullptr; @@ -939,7 +939,7 @@ namespace DOM { ::osl::MutexGuard const g(m_rMutex); - OSL_ASSERT(nullptr != m_aNodePtr); + assert(nullptr != m_aNodePtr); if (nullptr == m_aNodePtr) { return nullptr; } diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx index 2d191b5cd997..85e47daede05 100644 --- a/unoxml/source/dom/node.cxx +++ b/unoxml/source/dom/node.cxx @@ -141,7 +141,7 @@ namespace DOM ? &const_cast<CDocument&>(rDocument) : nullptr ) , m_rMutex(const_cast< ::osl::Mutex & >(rMutex)) { - OSL_ASSERT(m_aNodePtr); + assert(m_aNodePtr); } void CNode::invalidate() @@ -181,7 +181,7 @@ namespace DOM CDocument & CNode::GetOwnerDocument() { - OSL_ASSERT(m_xDocument.is()); + assert(m_xDocument.is()); return *m_xDocument; // needs overriding in CDocument! } 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, |