diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 13:03:03 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 13:03:03 +1000 |
| commit | a85694c4c7aae17aae3f419ef935ae5cab39b174 (patch) | |
| tree | eebf8391cb55a8ca8bc382c641e714ee0c9447d1 /xmlsecurity/source/framework | |
| parent | 48de83aa42166f0107ad5d98fce491d21173741f (diff) | |
tdf#43157: convert xmlsecurity module away from OSL_ASSERT to assert
Change-Id: Ib5297ceb307e8f8d475b7ff0523e6a57f72434a5
Diffstat (limited to 'xmlsecurity/source/framework')
4 files changed, 5 insertions, 5 deletions
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index 462a98c4ee62..5b56b2653893 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -187,7 +187,7 @@ void BufferNode::setBlocker(const ElementMark* pBlocker) * old blocker on this BufferNode, if there is one, will be overcasted. ******************************************************************************/ { - OSL_ASSERT(!(m_pBlocker != nullptr && pBlocker != nullptr)); + assert(!(m_pBlocker != nullptr && pBlocker != nullptr)); m_pBlocker = const_cast<ElementMark*>(pBlocker); if (m_pBlocker != nullptr) diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 934be03f7edc..1283b7acd887 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -848,7 +848,7 @@ sal_Int32 SAXEventKeeperImpl::createBlocker() sal_Int32 nId = m_nNextElementMarkId; m_nNextElementMarkId ++; - OSL_ASSERT(m_pNewBlocker == nullptr); + assert(m_pNewBlocker == nullptr); m_pNewBlocker = new ElementMark(cssxc::sax::ConstOfSecurityId::UNDEFINEDSECURITYID, nId); m_vElementMarkBuffers.push_back( m_pNewBlocker ); @@ -1170,7 +1170,7 @@ void SAL_CALL SAXEventKeeperImpl::setDocumentLocator( const cssu::Reference< css /* XInitialization */ void SAL_CALL SAXEventKeeperImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) { - OSL_ASSERT(aArguments.getLength() == 1); + assert(aArguments.getLength() == 1); aArguments[0] >>= m_xXMLDocument; m_xDocumentHandler.set( m_xXMLDocument, cssu::UNO_QUERY ); diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx b/xmlsecurity/source/framework/signaturecreatorimpl.cxx index d938601afed7..53ee5ebcb2b8 100644 --- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx +++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx @@ -166,7 +166,7 @@ void SAL_CALL SignatureCreatorImpl::removeSignatureCreationResultListener( /* XInitialization */ void SAL_CALL SignatureCreatorImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) { - OSL_ASSERT(aArguments.getLength() == 5); + assert(aArguments.getLength() == 5); OUString ouTempString; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index 0ae3b619ddcc..f31781438e7f 100644 --- a/xmlsecurity/source/framework/signatureverifierimpl.cxx +++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx @@ -120,7 +120,7 @@ void SAL_CALL SignatureVerifierImpl::removeSignatureVerifyResultListener( void SAL_CALL SignatureVerifierImpl::initialize( const cssu::Sequence< cssu::Any >& aArguments ) { - OSL_ASSERT(aArguments.getLength() == 5); + assert(aArguments.getLength() == 5); OUString ouTempString; |