revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380

10 files changed, 16 insertions, 16 deletions

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 60d596b6eab9..cedcb3ebc1d5 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -261,7 +261,7 @@ bool DigitalSignaturesDialog::canAddRemove()
         // It's always possible to append a PDF signature.
         return ret;
 
-    assert(maSignatureManager.mxStore.is());
+    OSL_ASSERT(maSignatureManager.mxStore.is());
     bool bDoc1_1 = DocumentSignatureHelper::isODFPre_1_2(m_sODFVersion);
     SaveODFItem item;
     bool bSave1_1 = item.isLessODF1_2();
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 676f50d803be..e989af368b60 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -157,7 +157,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 //then we have reached the end of the value
                 if (!bInValue)
                 {
-                    assert(!sType.isEmpty());
+                    OSL_ASSERT(!sType.isEmpty());
                     retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
                     sType.clear();
                     //The next char is the start of the new type
@@ -180,7 +180,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         }
         if (sbufValue.getLength())
         {
-            assert(!sType.isEmpty());
+            OSL_ASSERT(!sType.isEmpty());
             retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
         }
         return retVal;
@@ -252,7 +252,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
                 //then we have reached the end of the value
                 if (!bInValue)
                 {
-                    assert(!sType.isEmpty());
+                    OSL_ASSERT(!sType.isEmpty());
                     retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
                     sType.clear();
                     //The next char is the start of the new type
@@ -278,7 +278,7 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
         }
         if (!sbufValue.isEmpty())
         {
-            assert(!sType.isEmpty());
+            OSL_ASSERT(!sType.isEmpty());
             retVal.push_back(make_pair(sType, sbufValue.makeStringAndClear()));
         }
         return retVal;
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;
 
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 028cb3b8c8e3..96f78aaa6c80 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -163,7 +163,7 @@ DocumentSignatureAlgorithm
 DocumentSignatureHelper::getDocumentAlgorithm(
     const OUString & sODFVersion, const SignatureInformation & sigInfo)
 {
-    assert(!sODFVersion.isEmpty());
+    OSL_ASSERT(!sODFVersion.isEmpty());
     DocumentSignatureAlgorithm mode = DocumentSignatureAlgorithm::OOo3_2;
     if (!isOOo3_2_Signature(sigInfo))
     {
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 44158d33d6de..d63052996763 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -68,7 +68,7 @@ uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( con
 
 uno::Reference < io::XInputStream > UriBindingHelper::OpenInputStream( const uno::Reference < embed::XStorage >& rxStore, const OUString& rURI )
 {
-    assert(!rURI.isEmpty());
+    OSL_ASSERT(!rURI.isEmpty());
     uno::Reference < io::XInputStream > xInStream;
 
     OUString aURI(rURI);
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index cf532cb0f734..959e62cc34e0 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -583,7 +583,7 @@ verifyCertificate( const Reference< csss::XCertificate >& aCert,
     //CERT_PKIXVerifyCert does not take a db as argument. It will therefore
     //internally use CERT_GetDefaultCertDB
     //Make sure m_pHandler is the default DB
-    assert(m_pHandler == CERT_GetDefaultCertDB());
+    OSL_ASSERT(m_pHandler == CERT_GetDefaultCertDB());
     CERTCertDBHandle * certDb = m_pHandler != nullptr ? m_pHandler : CERT_GetDefaultCertDB();
     cert = xcert->getNssCert() ;
     if( cert != nullptr )
diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index 321b76da6fa3..1a40f347d74f 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -103,7 +103,7 @@ void XMLDocumentWrapper_XmlSecImpl::getNextSAXEvent()
  *  NODEPOSITION_NORMAL for other SAX events;
  ******************************************************************************/
 {
-    assert( m_pCurrentElement != nullptr );
+    OSL_ASSERT( m_pCurrentElement != nullptr );
 
         /*
          * Get the next event through tree order.
@@ -525,7 +525,7 @@ void XMLDocumentWrapper_XmlSecImpl::removeNode(const xmlNodePtr pNode) const
  ******************************************************************************/
 {
     /* you can't remove the current node */
-    assert( m_pCurrentElement != pNode );
+    OSL_ASSERT( m_pCurrentElement != pNode );
 
     xmlAttrPtr pAttr = pNode->properties;
 
@@ -604,7 +604,7 @@ void SAL_CALL XMLDocumentWrapper_XmlSecImpl::setCurrentElement( const cssu::Refe
 
 void SAL_CALL XMLDocumentWrapper_XmlSecImpl::removeCurrentElement(  )
 {
-    assert( m_pCurrentElement != nullptr );
+    OSL_ASSERT( m_pCurrentElement != nullptr );
 
     xmlNodePtr pOldCurrentElement = m_pCurrentElement;