From db979ee28a360d1222ddc8a67b929434c0c51255 Mon Sep 17 00:00:00 2001 From: Radu Ioan Date: Sat, 1 Jun 2013 22:28:05 +0300 Subject: fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO - replaced RTL_CONTEXT_ with SAL_INFO - replace OSL_* with SAL_* Change-Id: I9a7cce0d3abef42c9d9d0ad56609d94d504854cb Reviewed-on: https://gerrit.libreoffice.org/4128 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- package/source/xstor/owriteablestream.cxx | 83 +++++++------- package/source/xstor/xstorage.cxx | 181 +++++++++++++++--------------- 2 files changed, 130 insertions(+), 134 deletions(-) (limited to 'package') diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 3f0f3d9b8a7f..e8fa7e82f2b2 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -39,7 +39,6 @@ #include #include -#include #include #include @@ -103,7 +102,7 @@ namespace void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& xPropertySet, const uno::Sequence< beans::NamedValue >& aKey ) { - OSL_ENSURE( xPropertySet.is(), "No property set is provided!\n" ); + SAL_WARN_IF( !xPropertySet.is(), "package.xstor", "No property set is provided!" ); if ( !xPropertySet.is() ) throw uno::RuntimeException(); @@ -114,7 +113,7 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& { ::package::StaticAddLog( rException.Message ); ::package::StaticAddLog( OSL_LOG_PREFIX "Can't set encryption"); - OSL_FAIL( "Can't write encryption related properties!\n" ); + SAL_WARN( "package.xstor", "Can't write encryption related properties!" ); throw io::IOException(); // TODO } } @@ -122,7 +121,7 @@ void SetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& //----------------------------------------------- uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySet >& xPropertySet ) { - OSL_ENSURE( xPropertySet.is(), "No property set is provided!\n" ); + SAL_WARN_IF( !xPropertySet.is(), "package.xstor", "No property set is provided!" ); if ( !xPropertySet.is() ) throw uno::RuntimeException(); @@ -134,7 +133,7 @@ uno::Any GetEncryptionKeyProperty_Impl( const uno::Reference< beans::XPropertySe ::package::StaticAddLog( rException.Message ); ::package::StaticAddLog( OSL_LOG_PREFIX "Can't get encryption property" ); - OSL_FAIL( "Can't get encryption related properties!\n" ); + SAL_WARN( "package.xstor", "Can't get encryption related properties!" ); throw io::IOException(); // TODO } } @@ -291,9 +290,9 @@ OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent, , m_nRelInfoStatus( RELINFO_NO_INIT ) , m_nRelId( 1 ) { - OSL_ENSURE( xPackageStream.is(), "No package stream is provided!\n" ); - OSL_ENSURE( xPackage.is(), "No package component is provided!\n" ); - OSL_ENSURE( m_xContext.is(), "No package stream is provided!\n" ); + SAL_WARN_IF( !xPackageStream.is(), "package.xstor", "No package stream is provided!" ); + SAL_WARN_IF( !xPackage.is(), "package.xstor", "No package component is provided!" ); + SAL_WARN_IF( !m_xContext.is(), "package.xstor", "No package stream is provided!" ); OSL_ENSURE( pParent, "No parent storage is provided!\n" ); OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML || !m_xOrigRelInfoStream.is(), "The Relations info makes sence only for OFOPXML format!\n" ); } @@ -367,10 +366,10 @@ void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName, { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - OSL_ENSURE( m_bFlushed, "This method must not be called for nonflushed streams!\n" ); + SAL_WARN_IF( !m_bFlushed, "package.xstor", "This method must not be called for nonflushed streams!" ); if ( m_bFlushed ) { - OSL_ENSURE( m_xPackageStream.is(), "An inserted stream is incomplete!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "An inserted stream is incomplete!\n" ); uno::Reference< lang::XUnoTunnel > xTunnel( m_xPackageStream, uno::UNO_QUERY ); if ( !xTunnel.is() ) throw uno::RuntimeException(); // TODO @@ -403,7 +402,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted() uno::Any aValue = xPropSet->getPropertyValue("WasEncrypted"); if ( !( aValue >>= bWasEncr ) ) { - OSL_FAIL( "The property WasEncrypted has wrong type!\n" ); + SAL_WARN( "package.xstor", "The property WasEncrypted has wrong type!" ); } } @@ -414,7 +413,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted() { if ( !( m_aProps[nInd].Value >>= bToBeEncr ) ) { - OSL_FAIL( "The property has wrong type!\n" ); + SAL_WARN( "package.xstor", "The property has wrong type!" ); } } } @@ -444,7 +443,7 @@ sal_Bool OWriteStream_Impl::IsEncrypted() //----------------------------------------------- void OWriteStream_Impl::SetDecrypted() { - OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE, "The encryption is supported only for package storages!\n" ); + SAL_WARN_IF( m_nStorageType != embed::StorageFormats::PACKAGE, "package.xstor", "The encryption is supported only for package storages!" ); if ( m_nStorageType != embed::StorageFormats::PACKAGE ) throw uno::RuntimeException(); @@ -469,7 +468,7 @@ void OWriteStream_Impl::SetDecrypted() //----------------------------------------------- void OWriteStream_Impl::SetEncrypted( const ::comphelper::SequenceAsHashMap& aEncryptionData ) { - OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE, "The encryption is supported only for package storages!\n" ); + SAL_WARN_IF( m_nStorageType != embed::StorageFormats::PACKAGE, "package.xstor", "The encryption is supported only for package storages!" ); if ( m_nStorageType != embed::StorageFormats::PACKAGE ) throw uno::RuntimeException(); @@ -591,7 +590,7 @@ OUString OWriteStream_Impl::FillTempGetFileName() { // in case of new inserted package stream it is possible that input stream still was not set uno::Reference< io::XStream > xCacheStream = CreateMemoryStream( m_xContext ); - OSL_ENSURE( xCacheStream.is(), "If the stream can not be created an exception must be thrown!\n" ); + SAL_WARN_IF( !xCacheStream.is(), "package.xstor", "If the stream can not be created an exception must be thrown!" ); m_xCacheSeek.set( xCacheStream, uno::UNO_QUERY_THROW ); m_xCacheStream = xCacheStream; } @@ -606,7 +605,7 @@ OUString OWriteStream_Impl::FillTempGetFileName() if ( nRead <= MAX_STORCACHE_SIZE ) { uno::Reference< io::XStream > xCacheStream = CreateMemoryStream( m_xContext ); - OSL_ENSURE( xCacheStream.is(), "If the stream can not be created an exception must be thrown!\n" ); + SAL_WARN_IF( !xCacheStream.is(), "package.xstor", "If the stream can not be created an exception must be thrown!" ); if ( nRead ) { @@ -750,7 +749,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt // the parent storage is responsible for the correct handling // of deleted and renamed contents - OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" ); if ( m_bHasDataToFlush ) throw io::IOException(); @@ -830,7 +829,7 @@ void OWriteStream_Impl::Commit() { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; - OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" ); if ( !m_bHasDataToFlush ) return; @@ -1148,13 +1147,13 @@ uno::Sequence< beans::PropertyValue > OWriteStream_Impl::ReadPackageStreamProper AddLog( rException.Message ); AddLog( OSL_LOG_PREFIX "Quiet exception" ); - OSL_FAIL( "A property can't be retrieved!\n" ); + SAL_WARN( "package.xstor", "A property can't be retrieved!" ); } } } else { - OSL_FAIL( "Can not get properties from a package stream!\n" ); + SAL_WARN( "package.xstor", "Can not get properties from a package stream!" ); throw uno::RuntimeException(); } @@ -1167,7 +1166,7 @@ void OWriteStream_Impl::CopyInternallyTo_Impl( const uno::Reference< io::XStream { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; - OSL_ENSURE( !m_bUseCommonEncryption, "The stream can not be encrypted!" ); + SAL_WARN_IF( m_bUseCommonEncryption, "package.xstor", "The stream can not be encrypted!" ); if ( m_nStorageType != embed::StorageFormats::PACKAGE ) throw packages::NoEncryptionException(); @@ -1231,7 +1230,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; - OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" ); if ( m_pAntiImpl ) throw io::IOException(); // TODO: @@ -1276,13 +1275,13 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod AddLog( rException.Message ); AddLog( OSL_LOG_PREFIX "Quiet exception" ); - OSL_FAIL( "Can't write encryption related properties!\n" ); + SAL_WARN( "package.xstor", "Can't write encryption related properties!" ); SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); throw io::IOException(); // TODO: } } - OSL_ENSURE( xResultStream.is(), "In case stream can not be retrieved an exception must be thrown!\n" ); + SAL_WARN_IF( !xResultStream.is(), "package.xstor", "In case stream can not be retrieved an exception must be thrown!" ); return xResultStream; } @@ -1292,7 +1291,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream( sal_Int32 nStreamMod { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; - OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" ); if ( m_pAntiImpl ) throw io::IOException(); // TODO: @@ -1347,8 +1346,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre uno::Reference< io::XStream > xCompStream( static_cast< ::cppu::OWeakObject* >( pStream ), uno::UNO_QUERY ); - OSL_ENSURE( xCompStream.is(), - "OInputCompStream MUST provide XStream interfaces!\n" ); + SAL_WARN_IF( !xCompStream.is(), "package.xstor", "OInputCompStream MUST provide XStream interfaces!" ); m_aInputStreamsList.push_back( pStream ); return xCompStream; @@ -1372,8 +1370,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre uno::Reference< io::XStream > xSeekStream( static_cast< ::cppu::OWeakObject* >( pStream ), uno::UNO_QUERY ); - OSL_ENSURE( xSeekStream.is(), - "OInputSeekStream MUST provide XStream interfaces!\n" ); + SAL_WARN_IF( !xSeekStream.is(), "package.xstor", "OInputSeekStream MUST provide XStream interfaces!" ); m_aInputStreamsList.push_back( pStream ); return xSeekStream; @@ -1430,7 +1427,7 @@ uno::Reference< io::XStream > OWriteStream_Impl::GetStream_Impl( sal_Int32 nStre uno::Reference< io::XStream >( static_cast< ::cppu::OWeakObject* >( m_pAntiImpl ), uno::UNO_QUERY ); - OSL_ENSURE( xWriteStream.is(), "OWriteStream MUST implement XStream && XComponent interfaces!\n" ); + SAL_WARN_IF( !xWriteStream.is(), "package.xstor", "OWriteStream MUST implement XStream && XComponent interfaces!" ); return xWriteStream; } @@ -1443,7 +1440,7 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetPlainRawInStream() { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; - OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" ); // this method is used only internally, this stream object should not go outside of this implementation // if ( m_pAntiImpl ) @@ -1457,12 +1454,12 @@ uno::Reference< io::XInputStream > OWriteStream_Impl::GetRawInStream() { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ) ; - OSL_ENSURE( m_xPackageStream.is(), "No package stream is set!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "No package stream is set!" ); if ( m_pAntiImpl ) throw io::IOException(); // TODO: - OSL_ENSURE( IsEncrypted(), "Impossible to get raw representation for nonencrypted stream!\n" ); + SAL_WARN_IF( !IsEncrypted(), "package.xstor", "Impossible to get raw representation for nonencrypted stream!" ); if ( !IsEncrypted() ) throw packages::NoEncryptionException(); @@ -1530,7 +1527,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - OSL_ENSURE( m_xPackageStream.is(), "The source stream for copying is incomplete!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "The source stream for copying is incomplete!" ); if ( !m_xPackageStream.is() ) throw uno::RuntimeException(); @@ -1569,7 +1566,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - OSL_ENSURE( m_xPackageStream.is(), "The source stream for copying is incomplete!\n" ); + SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "The source stream for copying is incomplete!" ); if ( !m_xPackageStream.is() ) throw uno::RuntimeException(); @@ -1611,13 +1608,13 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar if ( !xDataToCopy.is() ) { - OSL_FAIL( "Encrypted ZipStream must already have input stream inside!\n" ); + SAL_WARN( "package.xstor", "Encrypted ZipStream must already have input stream inside!" ); SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); } } catch( const uno::Exception& rException ) { - OSL_FAIL( "Can't open encrypted stream!\n" ); + SAL_WARN( "package.xstor", "Can't open encrypted stream!" ); SetEncryptionKeyProperty_Impl( xPropertySet, uno::Sequence< beans::NamedValue >() ); AddLog( rException.Message ); AddLog( OSL_LOG_PREFIX "Rethrow" ); @@ -1832,7 +1829,7 @@ void OWriteStream::CheckInitOnDemand() if ( m_bInitOnDemand ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::CheckInitOnDemand, initializing" ); + SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::CheckInitOnDemand, initializing" ); uno::Reference< io::XStream > xStream = m_pImpl->GetTempFileAsStream(); if ( xStream.is() ) { @@ -1893,7 +1890,7 @@ void OWriteStream::CopyToStreamInternally_Impl( const uno::Reference< io::XStrea m_pImpl->AddLog( OSL_LOG_PREFIX "Quiet exception" ); // TODO: set the stoream in invalid state or dispose - OSL_FAIL( "The stream become invalid during copiing!\n" ); + SAL_WARN( "package.xstor", "The stream become invalid during copiing!" ); throw uno::RuntimeException(); } @@ -2322,7 +2319,7 @@ void SAL_CALL OWriteStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) if ( m_bInitOnDemand ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::CheckInitOnDemand, initializing" ); + SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::CheckInitOnDemand, initializing" ); uno::Reference< io::XStream > xStream = m_pImpl->GetTempFileAsStream(); if ( xStream.is() ) { @@ -2511,7 +2508,7 @@ void SAL_CALL OWriteStream::truncate() if ( !xTruncate.is() ) { - OSL_FAIL( "The output stream must support XTruncate interface!\n" ); + SAL_WARN( "package.xstor", "The output stream must support XTruncate interface!" ); throw uno::RuntimeException(); } @@ -3404,7 +3401,7 @@ void SAL_CALL OWriteStream::commit() embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::commit" ); + SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::commit" ); if ( !m_pImpl ) { @@ -3469,7 +3466,7 @@ void SAL_CALL OWriteStream::revert() embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OWriteStream::revert" ); + SAL_INFO( "package.xstor", "package (mv76033) OWriteStream::revert" ); // the method removes all the changes done after last commit diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 64ae0f1a91d9..ee1850c0877c 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -42,7 +42,6 @@ #include #include -#include #include #include @@ -211,7 +210,7 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > xInputStream, , m_nRelInfoStatus( RELINFO_NO_INIT ) { // all the checks done below by assertion statements must be done by factory - OSL_ENSURE( xInputStream.is(), "No input stream is provided!\n" ); + SAL_WARN_IF( !xInputStream.is(), "package.xstor", "No input stream is provided!" ); m_pSwitchStream = (SwitchablePersistenceStream*) new SwitchablePersistenceStream( xContext, xInputStream ); m_xInputStream = m_pSwitchStream->getInputStream(); @@ -219,7 +218,7 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XInputStream > xInputStream, if ( m_nStorageMode & embed::ElementModes::WRITE ) { // check that the stream allows to write - OSL_FAIL( "No stream for writing is provided!\n" ); + SAL_WARN( "package.xstor", "No stream for writing is provided!" ); } } @@ -251,7 +250,7 @@ OStorage_Impl::OStorage_Impl( uno::Reference< io::XStream > xStream, , m_nRelInfoStatus( RELINFO_NO_INIT ) { // all the checks done below by assertion statements must be done by factory - OSL_ENSURE( xStream.is(), "No stream is provided!\n" ); + SAL_WARN_IF( !xStream.is(), "package.xstor", "No stream is provided!" ); if ( m_nStorageMode & embed::ElementModes::WRITE ) { @@ -294,7 +293,7 @@ OStorage_Impl::OStorage_Impl( OStorage_Impl* pParent, , m_pRelStorElement( NULL ) , m_nRelInfoStatus( RELINFO_NO_INIT ) { - OSL_ENSURE( xPackageFolder.is(), "No package folder!\n" ); + SAL_WARN_IF( !xPackageFolder.is(), "package.xstor", "No package folder!" ); } //----------------------------------------------- @@ -304,7 +303,7 @@ OStorage_Impl::~OStorage_Impl() ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( m_pAntiImpl ) // root storage wrapper must set this member to NULL before destruction of object { - OSL_ENSURE( !m_bIsRoot, "The root storage wrapper must be disposed already" ); + SAL_WARN_IF( m_bIsRoot, "package.xstor", "The root storage wrapper must be disposed already" ); try { m_pAntiImpl->InternalDispose( sal_False ); @@ -452,7 +451,7 @@ void OStorage_Impl::RemoveReadOnlyWrap( OStorage& aStorage ) //----------------------------------------------- void OStorage_Impl::OpenOwnPackage() { - OSL_ENSURE( m_bIsRoot, "Opening of the package has no sence!\n" ); + SAL_WARN_IF( !m_bIsRoot, "package.xstor", "Opening of the package has no sence!" ); ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -465,7 +464,7 @@ void OStorage_Impl::OpenOwnPackage() aArguments[ 0 ] <<= m_xStream; else { - OSL_ENSURE( m_xInputStream.is(), "Input stream must be set for readonly access!\n" ); + SAL_WARN_IF( !m_xInputStream.is(), "package.xstor", "Input stream must be set for readonly access!" ); aArguments[ 0 ] <<= m_xInputStream; // TODO: if input stream is not seekable or XSeekable interface is supported // on XStream object a wrapper must be used @@ -519,7 +518,7 @@ void OStorage_Impl::OpenOwnPackage() } uno::Reference< container::XHierarchicalNameAccess > xHNameAccess( m_xPackage, uno::UNO_QUERY ); - OSL_ENSURE( xHNameAccess.is(), "The package could not be created!\n" ); + SAL_WARN_IF( !xHNameAccess.is(), "package.xstor", "The package could not be created!" ); if ( xHNameAccess.is() ) { @@ -528,7 +527,7 @@ void OStorage_Impl::OpenOwnPackage() } } - OSL_ENSURE( m_xPackageFolder.is(), "The package root folder can not be opened!\n" ); + SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "The package root folder can not be opened!" ); if ( !m_xPackageFolder.is() ) throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } @@ -644,12 +643,12 @@ void OStorage_Impl::ReadContents() if ( !xNamed.is() ) { - OSL_FAIL( "XNamed is not supported!\n" ); + SAL_WARN( "package.xstor", "XNamed is not supported!" ); throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } OUString aName = xNamed->getName(); - OSL_ENSURE( !aName.isEmpty(), "Empty name!\n" ); + SAL_WARN_IF( aName.isEmpty(), "package.xstor", "Empty name!" ); uno::Reference< container::XNameContainer > xNameContainer( xNamed, uno::UNO_QUERY ); @@ -678,7 +677,7 @@ void OStorage_Impl::ReadContents() AddLog( rNoSuchElementException.Message ); AddLog( OSL_LOG_PREFIX "NoSuchElement" ); - OSL_FAIL( "hasMoreElements() implementation has problems!\n" ); + SAL_WARN( "package.xstor", "hasMoreElements() implementation has problems!" ); break; } } @@ -791,8 +790,8 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, OUString aName, sal_Bool bDirect ) { - OSL_ENSURE( xDest.is(), "No destination storage!\n" ); - OSL_ENSURE( !aName.isEmpty(), "Empty element name!\n" ); + SAL_WARN_IF( !xDest.is(), "package.xstor", "No destination storage!" ); + SAL_WARN_IF( aName.isEmpty(), "package.xstor", "Empty element name!" ); ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -810,7 +809,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, xDest->openStorageElement( aName, embed::ElementModes::WRITE ); - OSL_ENSURE( xSubDest.is(), "No destination substorage!\n" ); + SAL_WARN_IF( !xSubDest.is(), "package.xstor", "No destination substorage!" ); if ( !pElement->m_pStorage ) { @@ -877,7 +876,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, if ( pElement->m_pStream->HasTempFile_Impl() || !pElement->m_pStream->m_xPackageStream.is() ) { - OSL_ENSURE( pElement->m_pStream->m_xPackageStream.is(), "No package stream!" ); + SAL_WARN_IF( !pElement->m_pStream->m_xPackageStream.is(), "package.xstor", "No package stream!" ); // if the stream is modified - the temporary file must be used for insertion xInputToInsert = pElement->m_pStream->GetTempFileAsInputStream(); @@ -900,14 +899,14 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, uno::Reference< io::XStream > xSubStr = xDest->openStreamElement( aName, embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); - OSL_ENSURE( xSubStr.is(), "No destination substream!\n" ); + SAL_WARN_IF( !xSubStr.is(), "package.xstor", "No destination substream!" ); pElement->m_pStream->CopyInternallyTo_Impl( xSubStr ); } } else if ( m_nStorageType != embed::StorageFormats::PACKAGE ) { - OSL_FAIL( "Encryption is only supported in package storage!\n" ); + SAL_WARN( "package.xstor", "Encryption is only supported in package storage!" ); throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } else if ( pElement->m_pStream->HasCachedEncryptionData() @@ -949,7 +948,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, xDest2->openEncryptedStream( aName, embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE, pElement->m_pStream->GetCachedEncryptionData().getAsConstNamedValueList() ); - OSL_ENSURE( xSubStr.is(), "No destination substream!\n" ); + SAL_WARN_IF( !xSubStr.is(), "package.xstor", "No destination substream!" ); pElement->m_pStream->CopyInternallyTo_Impl( xSubStr, pElement->m_pStream->GetCachedEncryptionData() ); } @@ -967,7 +966,7 @@ void OStorage_Impl::CopyStorageElement( SotElement_Impl* pElement, uno::Reference< io::XStream > xDestStream = xDest->openStreamElement( aName, embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE ); - OSL_ENSURE( xDestStream.is(), "No destination substream!\n" ); + SAL_WARN_IF( !xDestStream.is(), "package.xstor", "No destination substream!" ); completeStorageStreamCopy_Impl( xOwnStream, xDestStream, m_nStorageType, GetAllRelationshipsIfAny() ); uno::Reference< beans::XPropertySet > xProps( xDestStream, uno::UNO_QUERY_THROW ); @@ -1013,7 +1012,7 @@ void OStorage_Impl::CopyLastCommitTo( const uno::Reference< embed::XStorage >& x { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - OSL_ENSURE( m_xPackageFolder.is(), "A commited storage is incomplete!\n" ); + SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "A commited storage is incomplete!" ); if ( !m_xPackageFolder.is() ) throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1034,7 +1033,7 @@ void OStorage_Impl::InsertIntoPackageFolder( const OUString& aName, { ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); - OSL_ENSURE( m_xPackageFolder.is(), "An inserted storage is incomplete!\n" ); + SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "An inserted storage is incomplete!" ); uno::Reference< lang::XUnoTunnel > xTunnel( m_xPackageFolder, uno::UNO_QUERY ); if ( !xTunnel.is() ) throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1058,7 +1057,7 @@ void OStorage_Impl::Commit() ReadContents(); // if storage is commited it should have a valid Package representation - OSL_ENSURE( m_xPackageFolder.is(), "The package representation should exist!\n" ); + SAL_WARN_IF( !m_xPackageFolder.is(), "package.xstor", "The package representation should exist!" ); if ( !m_xPackageFolder.is() ) throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1263,7 +1262,7 @@ void OStorage_Impl::Commit() { uno::Reference< util::XChangesBatch > xChangesBatch( m_xPackage, uno::UNO_QUERY ); - OSL_ENSURE( xChangesBatch.is(), "Impossible to commit package!\n" ); + SAL_WARN_IF( !xChangesBatch.is(), "package.xstor", "Impossible to commit package!" ); if ( !xChangesBatch.is() ) throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1387,7 +1386,7 @@ void OStorage_Impl::Revert() //----------------------------------------------- SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName ) { - OSL_ENSURE( !rName.isEmpty(), "Name is empty!" ); + SAL_WARN_IF( rName.isEmpty(), "package.xstor", "Name is empty!" ); ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); @@ -1406,7 +1405,7 @@ SotElement_Impl* OStorage_Impl::FindElement( const OUString& rName ) //----------------------------------------------- SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr ) { - OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" ); + SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" ); if ( !m_xPackage.is() ) throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1415,7 +1414,7 @@ SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr ) uno::Reference< lang::XUnoTunnel > xNewElement( m_xPackage->createInstanceWithArguments( aSeq ), uno::UNO_QUERY ); - OSL_ENSURE( xNewElement.is(), "Not possible to create a new stream!\n" ); + SAL_WARN_IF( !xNewElement.is(), "package.xstor", "Not possible to create a new stream!" ); if ( !xNewElement.is() ) throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1442,7 +1441,7 @@ SotElement_Impl* OStorage_Impl::InsertStream( OUString aName, sal_Bool bEncr ) SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Reference< io::XInputStream >& xInStream ) { // insert of raw stream means insert and commit - OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" ); + SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" ); if ( !m_xPackage.is() ) throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1458,7 +1457,7 @@ SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Refe uno::Reference< lang::XUnoTunnel > xNewElement( m_xPackage->createInstanceWithArguments( aSeq ), uno::UNO_QUERY ); - OSL_ENSURE( xNewElement.is(), "Not possible to create a new stream!\n" ); + SAL_WARN_IF( !xNewElement.is(), "package.xstor", "Not possible to create a new stream!" ); if ( !xNewElement.is() ) throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1484,7 +1483,7 @@ SotElement_Impl* OStorage_Impl::InsertRawStream( OUString aName, const uno::Refe //----------------------------------------------- OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode ) { - OSL_ENSURE( m_xPackage.is(), "Not possible to refer to package as to factory!\n" ); + SAL_WARN_IF( !m_xPackage.is(), "package.xstor", "Not possible to refer to package as to factory!" ); if ( !m_xPackage.is() ) throw embed::InvalidStorageException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1493,7 +1492,7 @@ OStorage_Impl* OStorage_Impl::CreateNewStorageImpl( sal_Int32 nStorageMode ) uno::Reference< lang::XUnoTunnel > xNewElement( m_xPackage->createInstanceWithArguments( aSeq ), uno::UNO_QUERY ); - OSL_ENSURE( xNewElement.is(), "Not possible to create a new storage!\n" ); + SAL_WARN_IF( !xNewElement.is(), "package.xstor", "Not possible to create a new storage!" ); if ( !xNewElement.is() ) throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1534,10 +1533,10 @@ SotElement_Impl* OStorage_Impl::InsertElement( OUString aName, sal_Bool bIsStora { if ( (*pElementIter)->m_aName == aName ) { - OSL_ENSURE( (*pElementIter)->m_bIsRemoved, "Try to insert an element instead of existing one!\n" ); + SAL_WARN_IF( !(*pElementIter)->m_bIsRemoved, "package.xstor", "Try to insert an element instead of existing one!" ); if ( (*pElementIter)->m_bIsRemoved ) { - OSL_ENSURE( !(*pElementIter)->m_bIsInserted, "Inserted elements must be deleted immediatelly!\n" ); + SAL_WARN_IF( (*pElementIter)->m_bIsInserted, "package.xstor", "Inserted elements must be deleted immediatelly!" ); pDeletedElm = *pElementIter; break; } @@ -1562,14 +1561,14 @@ SotElement_Impl* OStorage_Impl::InsertElement( OUString aName, sal_Bool bIsStora //----------------------------------------------- void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorageMode ) { - OSL_ENSURE( pElement, "pElement is not set!\n" ); - OSL_ENSURE( pElement->m_bIsStorage, "Storage flag is not set!\n" ); + SAL_WARN_IF( !pElement, "package.xstor", "pElement is not set!" ); + SAL_WARN_IF( !pElement->m_bIsStorage, "package.xstor", "Storage flag is not set!" ); ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( !pElement->m_pStorage ) { - OSL_ENSURE( !pElement->m_bIsInserted, "Inserted element must be created already!\n" ); + SAL_WARN_IF( pElement->m_bIsInserted, "package.xstor", "Inserted element must be created already!" ); uno::Reference< lang::XUnoTunnel > xTunnel; m_xPackageFolder->getByName( pElement->m_aOriginalName ) >>= xTunnel; @@ -1578,7 +1577,7 @@ void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorag uno::Reference< container::XNameContainer > xPackageSubFolder( xTunnel, uno::UNO_QUERY ); - OSL_ENSURE( xPackageSubFolder.is(), "Can not get XNameContainer interface from folder!\n" ); + SAL_WARN_IF( !xPackageSubFolder.is(), "package.xstor", "Can not get XNameContainer interface from folder!" ); if ( !xPackageSubFolder.is() ) throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); @@ -1590,14 +1589,14 @@ void OStorage_Impl::OpenSubStorage( SotElement_Impl* pElement, sal_Int32 nStorag //----------------------------------------------- void OStorage_Impl::OpenSubStream( SotElement_Impl* pElement ) { - OSL_ENSURE( pElement, "pElement is not set!\n" ); - OSL_ENSURE( !pElement->m_bIsStorage, "Storage flag is set!\n" ); + SAL_WARN_IF( !pElement, "package.xstor", "pElement is not set!" ); + SAL_WARN_IF( pElement->m_bIsStorage, "package.xstor", "Storage flag is set!" ); ::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() ); if ( !pElement->m_pStream ) { - OSL_ENSURE( !pElement->m_bIsInserted, "Inserted element must be created already!\n" ); + SAL_WARN_IF( pElement->m_bIsInserted, "package.xstor", "Inserted element must be created already!" ); uno::Reference< lang::XUnoTunnel > xTunnel; m_xPackageFolder->getByName( pElement->m_aOriginalName ) >>= xTunnel; @@ -1638,7 +1637,7 @@ uno::Sequence< OUString > OStorage_Impl::GetElementNames() //----------------------------------------------- void OStorage_Impl::RemoveElement( SotElement_Impl* pElement ) { - OSL_ENSURE( pElement, "Element must be provided!" ); + SAL_WARN_IF( !pElement, "package.xstor", "Element must be provided!" ); if ( !pElement ) return; @@ -1775,7 +1774,7 @@ void OStorage_Impl::CommitStreamRelInfo( SotElement_Impl* pStreamElement ) if ( m_nStorageType == embed::StorageFormats::OFOPXML && pStreamElement->m_pStream ) { - OSL_ENSURE( !pStreamElement->m_aName.isEmpty(), "The name must not be empty!\n" ); + SAL_WARN_IF( pStreamElement->m_aName.isEmpty(), "package.xstor", "The name must not be empty!" ); if ( !m_xRelStorage.is() ) { @@ -1998,7 +1997,7 @@ OStorage::~OStorage() //----------------------------------------------- void SAL_CALL OStorage::InternalDispose( sal_Bool bNotifyImpl ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::InternalDispose" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::InternalDispose" ); if ( !m_pImpl ) { @@ -2110,7 +2109,7 @@ void OStorage::BroadcastModifiedIfNecessary() m_pImpl->m_bBroadcastModified = sal_False; - OSL_ENSURE( !m_pData->m_bReadOnlyWrap, "The storage can not be modified at all!\n" ); + SAL_WARN_IF( m_pData->m_bReadOnlyWrap, "package.xstor", "The storage can not be modified at all!" ); lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) ); @@ -2143,7 +2142,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage ) throw lang::DisposedException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } - OSL_ENSURE( !m_pData->m_bReadOnlyWrap, "The storage can not be modified at all!\n" ); + SAL_WARN_IF( m_pData->m_bReadOnlyWrap, "package.xstor", "The storage can not be modified at all!" ); lang::EventObject aSource( static_cast< ::cppu::OWeakObject* >(this) ); @@ -2201,7 +2200,7 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } - OSL_ENSURE( pElement, "In case element can not be created an exception must be thrown!" ); + SAL_WARN_IF( !pElement, "package.xstor", "In case element can not be created an exception must be thrown!" ); if ( !pElement->m_pStream ) m_pImpl->OpenSubStream( pElement ); @@ -2403,7 +2402,7 @@ void SAL_CALL OStorage::copyToStorage( const uno::Reference< embed::XStorage >& embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyToStorage" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyToStorage" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2471,7 +2470,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::openStreamElement" ); ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2497,7 +2496,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openStreamElement( OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" ); xResult = pElement->m_pStream->GetStream( nOpenMode, sal_False ); - OSL_ENSURE( xResult.is(), "The method must throw exception instead of removing empty result!\n" ); + SAL_WARN_IF( !xResult.is(), "package.xstor", "The method must throw exception instead of removing empty result!" ); if ( m_pData->m_bReadOnlyWrap ) { @@ -2574,7 +2573,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStreamElement( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openEncryptedStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::openEncryptedStreamElement" ); return openEncryptedStream( aStreamName, nOpenMode, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); } @@ -2588,7 +2587,7 @@ uno::Reference< embed::XStorage > SAL_CALL OStorage::openStorageElement( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openStorageElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::openStorageElement" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2742,7 +2741,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneStreamElement( const OUStr embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneStreamElement" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2826,7 +2825,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStreamElement( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneEncryptedStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneEncryptedStreamElement" ); return cloneEncryptedStream( aStreamName, ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); } @@ -2840,7 +2839,7 @@ void SAL_CALL OStorage::copyLastCommitTo( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyLastCommitTo" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyLastCommitTo" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -2907,7 +2906,7 @@ void SAL_CALL OStorage::copyStorageElementLastCommitTo( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyStorageElementLastCommitTo" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyStorageElementLastCommitTo" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3140,7 +3139,7 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName ) embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::removeElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::removeElement" ); ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3233,7 +3232,7 @@ void SAL_CALL OStorage::renameElement( const OUString& aElementName, const OUStr embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::renameElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::renameElement" ); ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3338,7 +3337,7 @@ void SAL_CALL OStorage::copyElementTo( const OUString& aElementName, embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyElementTo" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyElementTo" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3441,7 +3440,7 @@ void SAL_CALL OStorage::moveElementTo( const OUString& aElementName, embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::moveElementTo" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::moveElementTo" ); ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3557,7 +3556,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::openEncryptedStream" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::openEncryptedStream" ); ::osl::ResettableMutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3583,7 +3582,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::openEncryptedStream( OSL_ENSURE( pElement && pElement->m_pStream, "In case element can not be created an exception must be thrown!" ); xResult = pElement->m_pStream->GetStream( nOpenMode, aEncryptionData, sal_False ); - OSL_ENSURE( xResult.is(), "The method must throw exception instead of removing empty result!\n" ); + SAL_WARN_IF( !xResult.is(), "package.xstor", "The method must throw exception instead of removing empty result!" ); if ( m_pData->m_bReadOnlyWrap ) { @@ -3667,7 +3666,7 @@ uno::Reference< io::XStream > SAL_CALL OStorage::cloneEncryptedStream( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::cloneEncryptedStream" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::cloneEncryptedStream" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3760,7 +3759,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getPlainRawStreamElement( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getPlainRawStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getPlainRawStreamElement" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3868,7 +3867,7 @@ uno::Reference< io::XInputStream > SAL_CALL OStorage::getRawEncrStreamElement( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getRawEncrStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getRawEncrStreamElement" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -3986,7 +3985,7 @@ void SAL_CALL OStorage::insertRawEncrStreamElement( const OUString& aStreamName, embed::StorageWrappedTargetException, uno::RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::insertRawEncrStreamElement" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::insertRawEncrStreamElement" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4080,7 +4079,7 @@ void SAL_CALL OStorage::commit() embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::commit" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::commit" ); uno::Reference< util::XModifiable > xParentModif; @@ -4146,7 +4145,7 @@ void SAL_CALL OStorage::revert() embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::revert" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::revert" ); // the method removes all the changes done after last commit @@ -4344,7 +4343,7 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName ) lang::WrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getByName" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getByName" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4410,7 +4409,7 @@ uno::Any SAL_CALL OStorage::getByName( const OUString& aName ) uno::Sequence< OUString > SAL_CALL OStorage::getElementNames() throw ( uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getElementNames" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getElementNames" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4448,7 +4447,7 @@ uno::Sequence< OUString > SAL_CALL OStorage::getElementNames() sal_Bool SAL_CALL OStorage::hasByName( const OUString& aName ) throw ( uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::hasByName" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::hasByName" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4512,7 +4511,7 @@ uno::Type SAL_CALL OStorage::getElementType() sal_Bool SAL_CALL OStorage::hasElements() throw ( uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::hasElements" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::hasElements" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4627,7 +4626,7 @@ void SAL_CALL OStorage::setEncryptionPassword( const OUString& aPass ) throw ( uno::RuntimeException, io::IOException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionPassword" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionPassword" ); setEncryptionData( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) ); } @@ -4636,7 +4635,7 @@ void SAL_CALL OStorage::removeEncryption() throw ( uno::RuntimeException, io::IOException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::removeEncryption" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::removeEncryption" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4649,7 +4648,7 @@ void SAL_CALL OStorage::removeEncryption() if ( m_pData->m_nStorageType != embed::StorageFormats::PACKAGE ) throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // the interface must be visible only for package storage - OSL_ENSURE( m_pData->m_bIsRoot, "removeEncryption() method is not available for nonroot storages!\n" ); + SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "removeEncryption() method is not available for nonroot storages!" ); if ( m_pData->m_bIsRoot ) { try { @@ -4690,7 +4689,7 @@ void SAL_CALL OStorage::removeEncryption() m_pImpl->AddLog( rRException.Message ); m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" ); - OSL_ENSURE( sal_False, "The call must not fail, it is pretty simple!" ); + SAL_WARN( "package.xstor", "The call must not fail, it is pretty simple!" ); throw; } catch( const uno::Exception& rException ) @@ -4698,7 +4697,7 @@ void SAL_CALL OStorage::removeEncryption() m_pImpl->AddLog( rException.Message ); m_pImpl->AddLog( OSL_LOG_PREFIX "Rethrow" ); - OSL_FAIL( "The call must not fail, it is pretty simple!" ); + SAL_WARN( "package.xstor", "The call must not fail, it is pretty simple!" ); throw io::IOException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); } } @@ -4712,7 +4711,7 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu throw ( io::IOException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionData" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionData" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4728,7 +4727,7 @@ void SAL_CALL OStorage::setEncryptionData( const uno::Sequence< beans::NamedValu if ( !aEncryptionData.getLength() ) throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected empty encryption data!", uno::Reference< uno::XInterface >() ); - OSL_ENSURE( m_pData->m_bIsRoot, "setEncryptionData() method is not available for nonroot storages!\n" ); + SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "setEncryptionData() method is not available for nonroot storages!" ); if ( m_pData->m_bIsRoot ) { try { @@ -4788,7 +4787,7 @@ sal_Bool SAL_CALL OStorage::hasEncryptionData() void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::NamedValue >& aAlgorithms ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setEncryptionAlgorithms" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::setEncryptionAlgorithms" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4804,7 +4803,7 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam if ( !aAlgorithms.getLength() ) throw uno::RuntimeException( OSL_LOG_PREFIX "Unexpected empty encryption algorithms list!", uno::Reference< uno::XInterface >() ); - OSL_ENSURE( m_pData->m_bIsRoot, "setEncryptionAlgorithms() method is not available for nonroot storages!\n" ); + SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "setEncryptionAlgorithms() method is not available for nonroot storages!" ); if ( m_pData->m_bIsRoot ) { try { @@ -4854,7 +4853,7 @@ void SAL_CALL OStorage::setEncryptionAlgorithms( const uno::Sequence< beans::Nam uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms() throw (uno::RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getEncryptionAlgorithms" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getEncryptionAlgorithms" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -4868,7 +4867,7 @@ uno::Sequence< beans::NamedValue > SAL_CALL OStorage::getEncryptionAlgorithms() throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // the interface must be visible only for package storage uno::Sequence< beans::NamedValue > aResult; - OSL_ENSURE( m_pData->m_bIsRoot, "getEncryptionAlgorithms() method is not available for nonroot storages!\n" ); + SAL_WARN_IF( !m_pData->m_bIsRoot, "package.xstor", "getEncryptionAlgorithms() method is not available for nonroot storages!" ); if ( m_pData->m_bIsRoot ) { try { @@ -4945,7 +4944,7 @@ void SAL_CALL OStorage::setPropertyValue( const OUString& aPropertyName, const u lang::WrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::setPropertyValue" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::setPropertyValue" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5054,7 +5053,7 @@ uno::Any SAL_CALL OStorage::getPropertyValue( const OUString& aPropertyName ) lang::WrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getPropertyValue" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getPropertyValue" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5651,7 +5650,7 @@ void SAL_CALL OStorage::insertStreamElementDirect( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::insertStreamElementDirect" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::insertStreamElementDirect" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5743,7 +5742,7 @@ void SAL_CALL OStorage::copyElementDirectlyTo( embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::copyElementDirectlyTo" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::copyElementDirectlyTo" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5842,7 +5841,7 @@ void SAL_CALL OStorage::writeAndAttachToStream( const uno::Reference< io::XStrea embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::writeAndAttachToStream" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::writeAndAttachToStream" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5914,7 +5913,7 @@ void SAL_CALL OStorage::attachToURL( const OUString& sURL, embed::StorageWrappedTargetException, uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::attachToURL" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::attachToURL" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -5999,7 +5998,7 @@ uno::Any SAL_CALL OStorage::getElementPropertyValue( const OUString& aElementNam embed::StorageWrappedTargetException, uno::RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "package (mv76033) OStorage::getElementPropertyValue" ); + SAL_INFO( "package.xstor", "package (mv76033) OStorage::getElementPropertyValue" ); ::osl::MutexGuard aGuard( m_pData->m_rSharedMutexRef->GetMutex() ); @@ -6125,7 +6124,7 @@ void SAL_CALL OStorage::copyStreamElementData( const OUString& aStreamName, cons uno::Reference< io::XStream > xNonconstRef = xTargetStream; m_pImpl->CloneStreamElement( aStreamName, sal_False, ::comphelper::SequenceAsHashMap(), xNonconstRef ); - OSL_ENSURE( xNonconstRef == xTargetStream, "The provided stream reference seems not be filled in correctly!\n" ); + SAL_WARN_IF( xNonconstRef != xTargetStream, "package.xstor", "The provided stream reference seems not be filled in correctly!" ); if ( xNonconstRef != xTargetStream ) throw uno::RuntimeException( OSL_LOG_PREFIX, uno::Reference< uno::XInterface >() ); // if the stream reference is set it must not be changed! } -- cgit