diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /xmlsecurity/source/framework | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
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 5b56b2653893..462a98c4ee62 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. ******************************************************************************/ { - assert(!(m_pBlocker != nullptr && pBlocker != nullptr)); + OSL_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 1283b7acd887..934be03f7edc 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 ++; - assert(m_pNewBlocker == nullptr); + OSL_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 ) { - assert(aArguments.getLength() == 1); + OSL_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 53ee5ebcb2b8..d938601afed7 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 ) { - assert(aArguments.getLength() == 5); + OSL_ASSERT(aArguments.getLength() == 5); OUString ouTempString; diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx b/xmlsecurity/source/framework/signatureverifierimpl.cxx index f31781438e7f..0ae3b619ddcc 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 ) { - assert(aArguments.getLength() == 5); + OSL_ASSERT(aArguments.getLength() == 5); OUString ouTempString; |