diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:54:57 +1000 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 08:55:03 +1000 |
commit | 367fa84af9783be40cc05adb154612e38c237172 (patch) | |
tree | 2ad6337a713f8ef7a948066fac378d36e4c7896d /ucb | |
parent | f4da706256bbf3d7828419c97ffbfa98d4d48120 (diff) |
tdf#43157: convert ucb and svl from OSL_ASSERT to assert
Change-Id: I34579b2ec0b9a2a98361108bc259ddb1fc1df7b5
Diffstat (limited to 'ucb')
-rw-r--r-- | ucb/source/core/ucb.cxx | 2 | ||||
-rw-r--r-- | ucb/source/regexp/regexp.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/file/filtask.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_storage.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonSession.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index ed617c47f077..0941b074d91e 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; - OSL_ASSERT( xHierNameAccess.is() ); + 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 94ca028af92a..a315fbde4631 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) { - OSL_ASSERT(m_eKind == KIND_DOMAIN + assert(m_eKind == KIND_DOMAIN || (!m_bEmptyDomain && m_aInfix.isEmpty())); - OSL_ASSERT(m_bTranslation || m_aReversePrefix.isEmpty()); + assert(m_bTranslation || m_aReversePrefix.isEmpty()); } @@ -153,7 +153,7 @@ bool isScheme(OUString const & rString, bool bColon) void appendStringLiteral(OUStringBuffer * pBuffer, OUString const & rString) { - OSL_ASSERT(pBuffer); + 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 e78bb9ed46eb..20092bc7fb71 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) { - OSL_ASSERT(item != nullptr && type != nullptr); + 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() ) { - OSL_ASSERT( m_xFileRegistry.is() ); + assert( m_xFileRegistry.is() ); return; } @@ -2996,7 +2996,7 @@ TaskManager::copyPersistentSet( const OUString& srcUnqPath, { if( ! m_xFileRegistry.is() ) { - OSL_ASSERT( m_xFileRegistry.is() ); + assert( m_xFileRegistry.is() ); return; } diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 39a0742d2ab8..ff8a0f67fe9d 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 ) { - OSL_ASSERT( pElement ); + 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 eb001870c1f7..f1db26a59787 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 ) { - OSL_ASSERT( pElement ); + 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 6e808ebe07d2..5d74ad40636c 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 ) { - OSL_ASSERT( cert ); + assert( cert ); NeonSession * pSession = static_cast< NeonSession * >( userdata ); uno::Reference< security::XCertificateContainer > xCertificateContainer; |