From 97eb00c75e173d4c8d0b483a7941ad3d2f23783e Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Sun, 7 May 2017 17:03:35 +1000
Subject: revert OSL_ASSERT changes

Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
---
 ucb/source/core/ucb.cxx                          | 2 +-
 ucb/source/regexp/regexp.cxx                     | 6 +++---
 ucb/source/ucp/file/filtask.cxx                  | 6 +++---
 ucb/source/ucp/tdoc/tdoc_storage.cxx             | 2 +-
 ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 2 +-
 ucb/source/ucp/webdav-neon/NeonSession.cxx       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 0941b074d91e..ed617c47f077 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -719,7 +719,7 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent&
         uno::Reference< container::XHierarchicalNameAccess > xHierNameAccess;
         Event.Base >>= xHierNameAccess;
 
-        assert( xHierNameAccess.is() );
+        OSL_ASSERT( xHierNameAccess.is() );
 
         const util::ElementChange* pElementChanges
             = Event.Changes.getConstArray();
diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx
index a315fbde4631..94ca028af92a 100644
--- a/ucb/source/regexp/regexp.cxx
+++ b/ucb/source/regexp/regexp.cxx
@@ -45,9 +45,9 @@ inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix,
     m_bEmptyDomain(bTheEmptyDomain),
     m_bTranslation(bTheTranslation)
 {
-    assert(m_eKind == KIND_DOMAIN
+    OSL_ASSERT(m_eKind == KIND_DOMAIN
                || (!m_bEmptyDomain && m_aInfix.isEmpty()));
-    assert(m_bTranslation || m_aReversePrefix.isEmpty());
+    OSL_ASSERT(m_bTranslation || m_aReversePrefix.isEmpty());
 }
 
 
@@ -153,7 +153,7 @@ bool isScheme(OUString const & rString, bool bColon)
 void appendStringLiteral(OUStringBuffer * pBuffer,
                          OUString const & rString)
 {
-    assert(pBuffer);
+    OSL_ASSERT(pBuffer);
 
     pBuffer->append('"');
     sal_Unicode const * p = rString.getStr();
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 20092bc7fb71..e78bb9ed46eb 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -1377,7 +1377,7 @@ bool getType(
     TaskManager & task, sal_Int32 id, OUString const & fileUrl,
     osl::DirectoryItem * item, osl::FileStatus::Type * type)
 {
-    assert(item != nullptr && type != nullptr);
+    OSL_ASSERT(item != nullptr && type != nullptr);
     osl::FileBase::RC err = osl::DirectoryItem::get(fileUrl, *item);
     if (err != osl::FileBase::E_None) {
         task.installError(id, TASKHANDLING_TRANSFER_BY_COPY_SOURCE, err);
@@ -2935,7 +2935,7 @@ TaskManager::erasePersistentSet( const OUString& aUnqPath,
 {
     if( ! m_xFileRegistry.is() )
     {
-        assert( m_xFileRegistry.is() );
+        OSL_ASSERT( m_xFileRegistry.is() );
         return;
     }
 
@@ -2996,7 +2996,7 @@ TaskManager::copyPersistentSet( const OUString& srcUnqPath,
 {
     if( ! m_xFileRegistry.is() )
     {
-        assert( m_xFileRegistry.is() );
+        OSL_ASSERT( m_xFileRegistry.is() );
         return;
     }
 
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index ff8a0f67fe9d..39a0742d2ab8 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -323,7 +323,7 @@ StorageElementFactory::createStream( const OUString & rUri,
 
 void StorageElementFactory::releaseElement( Storage * pElement )
 {
-    assert( pElement );
+    OSL_ASSERT( pElement );
     osl::MutexGuard aGuard( m_aMutex );
     if ( pElement->m_aContainerIt != m_aMap.end() )
         m_aMap.erase( pElement->m_aContainerIt );
diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
index f1db26a59787..eb001870c1f7 100644
--- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx
@@ -99,7 +99,7 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession(
 
 void DAVSessionFactory::releaseElement( DAVSession * pElement )
 {
-    assert( pElement );
+    OSL_ASSERT( pElement );
     osl::MutexGuard aGuard( m_aMutex );
     if ( pElement->m_aContainerIt != m_aMap.end() )
         m_aMap.erase( pElement->m_aContainerIt );
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 5d74ad40636c..6e808ebe07d2 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -351,7 +351,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata,
                                                 int,
                                                 const ne_ssl_certificate *cert )
 {
-    assert( cert );
+    OSL_ASSERT( cert );
 
     NeonSession * pSession = static_cast< NeonSession * >( userdata );
     uno::Reference< security::XCertificateContainer > xCertificateContainer;
-- 
cgit v1.2.3