summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-20 11:08:35 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-21 09:15:11 +0200
commit8c8f2a528534c31708028825d327601d7bec804c (patch)
treec7905b70ed9dac0f53f72eef4efc33e1e7cf1c0d /package
parent841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (diff)
remove unnecessary explicit linefeeds from end of SAL and OSL log calls
Change-Id: I3fa363c8e76e6cfb297f4ec346e3f031c09d6fbf Reviewed-on: https://gerrit.libreoffice.org/36727 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
-rw-r--r--package/source/xstor/ocompinstream.cxx2
-rw-r--r--package/source/xstor/oseekinstream.cxx4
-rw-r--r--package/source/xstor/owriteablestream.cxx30
-rw-r--r--package/source/xstor/switchpersistencestream.cxx2
-rw-r--r--package/source/xstor/xfactory.cxx16
-rw-r--r--package/source/xstor/xfactory.hxx2
-rw-r--r--package/source/xstor/xstorage.cxx12
-rw-r--r--package/source/zipapi/XUnbufferedStream.cxx2
-rw-r--r--package/source/zipapi/ZipFile.cxx2
-rw-r--r--package/source/zippackage/ZipPackage.cxx4
-rw-r--r--package/source/zippackage/ZipPackageEntry.cxx2
-rw-r--r--package/source/zippackage/ZipPackageStream.cxx10
-rw-r--r--package/source/zippackage/wrapstreamforshare.cxx2
-rw-r--r--package/source/zippackage/zipfileaccess.cxx8
14 files changed, 49 insertions, 49 deletions
diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx
index 222af14fe848..0f73bdc2f6b6 100644
--- a/package/source/xstor/ocompinstream.cxx
+++ b/package/source/xstor/ocompinstream.cxx
@@ -41,7 +41,7 @@ OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl,
, m_bDisposed( false )
, m_nStorageType( nStorageType )
{
- OSL_ENSURE( m_pImpl->m_rMutexRef.is(), "No mutex is provided!\n" );
+ OSL_ENSURE( m_pImpl->m_rMutexRef.is(), "No mutex is provided!" );
if ( !m_pImpl->m_rMutexRef.is() )
throw uno::RuntimeException(); // just a disaster
diff --git a/package/source/xstor/oseekinstream.cxx b/package/source/xstor/oseekinstream.cxx
index 8ded31612130..444637e90278 100644
--- a/package/source/xstor/oseekinstream.cxx
+++ b/package/source/xstor/oseekinstream.cxx
@@ -34,7 +34,7 @@ OInputSeekStream::OInputSeekStream( OWriteStream_Impl& pImpl,
: OInputCompStream( pImpl, xStream, aProps, nStorageType )
{
m_xSeekable.set( m_xStream, uno::UNO_QUERY );
- OSL_ENSURE( m_xSeekable.is(), "No seeking support!\n" );
+ OSL_ENSURE( m_xSeekable.is(), "No seeking support!" );
}
OInputSeekStream::OInputSeekStream( uno::Reference < io::XInputStream > const & xStream,
@@ -43,7 +43,7 @@ OInputSeekStream::OInputSeekStream( uno::Reference < io::XInputStream > const &
: OInputCompStream( xStream, aProps, nStorageType )
{
m_xSeekable.set( m_xStream, uno::UNO_QUERY );
- OSL_ENSURE( m_xSeekable.is(), "No seeking support!\n" );
+ OSL_ENSURE( m_xSeekable.is(), "No seeking support!" );
}
OInputSeekStream::~OInputSeekStream()
diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx
index 725cf810d877..6dcc6b0b2d75 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -288,8 +288,8 @@ OWriteStream_Impl::OWriteStream_Impl( OStorage_Impl* pParent,
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 sense only for OFOPXML format!\n" );
+ OSL_ENSURE( pParent, "No parent storage is provided!" );
+ OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML || !m_xOrigRelInfoStream.is(), "The Relations info makes sense only for OFOPXML format!" );
}
OWriteStream_Impl::~OWriteStream_Impl()
@@ -340,7 +340,7 @@ void OWriteStream_Impl::InsertIntoPackageFolder( const OUString& aName,
SAL_WARN_IF( !m_bFlushed, "package.xstor", "This method must not be called for nonflushed streams!" );
if ( m_bFlushed )
{
- SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "An inserted stream is incomplete!\n" );
+ SAL_WARN_IF( !m_xPackageStream.is(), "package.xstor", "An inserted stream is incomplete!" );
uno::Reference< lang::XUnoTunnel > xTunnel( m_xPackageStream, uno::UNO_QUERY_THROW );
xParentPackageFolder->insertByName( aName, uno::makeAny( xTunnel ) );
@@ -704,7 +704,7 @@ void OWriteStream_Impl::InsertStreamDirectly( const uno::Reference< io::XInputSt
if ( m_bHasDataToFlush )
throw io::IOException();
- OSL_ENSURE( m_aTempURL.isEmpty() && !m_xCacheStream.is(), "The temporary must not exist!\n" );
+ OSL_ENSURE( m_aTempURL.isEmpty() && !m_xCacheStream.is(), "The temporary must not exist!" );
// use new file as current persistent representation
// the new file will be removed after it's stream is closed
@@ -882,7 +882,7 @@ void OWriteStream_Impl::Revert()
if ( !m_bHasDataToFlush )
return; // nothing to do
- OSL_ENSURE( !m_aTempURL.isEmpty() || m_xCacheStream.is(), "The temporary must exist!\n" );
+ OSL_ENSURE( !m_aTempURL.isEmpty() || m_xCacheStream.is(), "The temporary must exist!" );
if ( m_xCacheStream.is() )
{
@@ -1526,7 +1526,7 @@ void OWriteStream_Impl::GetCopyOfLastCommit( uno::Reference< io::XStream >& xTar
void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStorage >& xRelStorage, const OUString& aOrigStreamName, const OUString& aNewStreamName )
{
// at this point of time the old stream must be already cleaned
- OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML, "The method should be used only with OFOPXML format!\n" );
+ OSL_ENSURE( m_nStorageType == embed::StorageFormats::OFOPXML, "The method should be used only with OFOPXML format!" );
if ( m_nStorageType == embed::StorageFormats::OFOPXML )
{
@@ -1632,8 +1632,8 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, bool bTransacted )
, m_nInitPosition( 0 )
, m_bTransacted( bTransacted )
{
- OSL_ENSURE( pImpl, "No base implementation!\n" );
- OSL_ENSURE( m_pImpl->m_rMutexRef.is(), "No mutex!\n" );
+ OSL_ENSURE( pImpl, "No base implementation!" );
+ OSL_ENSURE( m_pImpl->m_rMutexRef.is(), "No mutex!" );
if ( !m_pImpl || !m_pImpl->m_rMutexRef.is() )
throw uno::RuntimeException(); // just a disaster
@@ -1648,8 +1648,8 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStrea
, m_nInitPosition( 0 )
, m_bTransacted( bTransacted )
{
- OSL_ENSURE( pImpl && xStream.is(), "No base implementation!\n" );
- OSL_ENSURE( m_pImpl->m_rMutexRef.is(), "No mutex!\n" );
+ OSL_ENSURE( pImpl && xStream.is(), "No base implementation!" );
+ OSL_ENSURE( m_pImpl->m_rMutexRef.is(), "No mutex!" );
if ( !m_pImpl || !m_pImpl->m_rMutexRef.is() )
throw uno::RuntimeException(); // just a disaster
@@ -1661,7 +1661,7 @@ OWriteStream::OWriteStream( OWriteStream_Impl* pImpl, uno::Reference< io::XStrea
m_xInStream = xStream->getInputStream();
m_xOutStream = xStream->getOutputStream();
m_xSeekable.set( xStream, uno::UNO_QUERY );
- OSL_ENSURE( m_xInStream.is() && m_xOutStream.is() && m_xSeekable.is(), "Stream implementation is incomplete!\n" );
+ OSL_ENSURE( m_xInStream.is() && m_xOutStream.is() && m_xSeekable.is(), "Stream implementation is incomplete!" );
}
}
@@ -2426,7 +2426,7 @@ void SAL_CALL OWriteStream::setEncryptionPassword( const OUString& aPass )
throw lang::DisposedException();
}
- OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!\n" );
+ OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!" );
m_pImpl->SetEncrypted( ::comphelper::OStorageHelper::CreatePackageEncryptionData( aPass ) );
@@ -2445,7 +2445,7 @@ void SAL_CALL OWriteStream::removeEncryption()
throw lang::DisposedException();
}
- OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!\n" );
+ OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!" );
m_pImpl->SetDecrypted();
@@ -2464,7 +2464,7 @@ void SAL_CALL OWriteStream::setEncryptionData( const uno::Sequence< beans::Named
throw lang::DisposedException();
}
- OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!\n" );
+ OSL_ENSURE( m_pImpl->m_xPackageStream.is(), "No package stream is set!" );
m_pImpl->SetEncrypted( aEncryptionData );
@@ -3117,7 +3117,7 @@ void OWriteStream::BroadcastTransaction( sal_Int8 nMessage )
::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
while ( pIterator.hasMoreElements( ) )
{
- OSL_ENSURE( nMessage >= 1 && nMessage <= 4, "Wrong internal notification code is used!\n" );
+ OSL_ENSURE( nMessage >= 1 && nMessage <= 4, "Wrong internal notification code is used!" );
switch( nMessage )
{
diff --git a/package/source/xstor/switchpersistencestream.cxx b/package/source/xstor/switchpersistencestream.cxx
index c7c2ac87b435..664f455e5cbb 100644
--- a/package/source/xstor/switchpersistencestream.cxx
+++ b/package/source/xstor/switchpersistencestream.cxx
@@ -317,7 +317,7 @@ void SAL_CALL SwitchablePersistenceStream::flush( )
if ( !m_pStreamData || m_pStreamData->m_bInStreamBased )
{
- OSL_FAIL( "flush() is not acceptable!\n" );
+ OSL_FAIL( "flush() is not acceptable!" );
return;
// in future throw exception, for now some code might call flush() on closed stream
// since file ucp implementation allows it
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index d6c2730e7c5e..bf73ca7525b4 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -123,7 +123,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
{
if( !( aArguments[1] >>= nStorageMode ) )
{
- OSL_FAIL( "Wrong second argument!\n" );
+ OSL_FAIL( "Wrong second argument!" );
throw lang::IllegalArgumentException(); // TODO:
}
// it's always possible to read written storage in this implementation
@@ -143,13 +143,13 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
{
if ( aURL.isEmpty() )
{
- OSL_FAIL( "Empty URL is provided!\n" );
+ OSL_FAIL( "Empty URL is provided!" );
throw lang::IllegalArgumentException(); // TODO:
}
if ( aURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:") )
{
- OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ???
+ OSL_FAIL( "Packages URL's are not valid for storages!" ); // ???
throw lang::IllegalArgumentException(); // TODO:
}
@@ -164,7 +164,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
}
else if ( !( aArguments[0] >>= xStream ) && !( aArguments[0] >>= xInputStream ) )
{
- OSL_FAIL( "Wrong first argument!\n" );
+ OSL_FAIL( "Wrong first argument!" );
throw uno::Exception(); // TODO: Illegal argument
}
@@ -225,12 +225,12 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 1 );
}
else
- OSL_FAIL( "Unacceptable property, will be ignored!\n" );
+ OSL_FAIL( "Unacceptable property, will be ignored!" );
}
}
else
{
- OSL_FAIL( "Wrong third argument!\n" );
+ OSL_FAIL( "Wrong third argument!" );
throw uno::Exception(); // TODO: Illegal argument
}
@@ -247,7 +247,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
if ( !xSeekable.is() )
{
// TODO: wrap stream to let it be seekable
- OSL_FAIL( "Nonseekable streams are not supported for now!\n" );
+ OSL_FAIL( "Nonseekable streams are not supported for now!" );
}
if ( !CheckPackageSignature_Impl( xInputStream, xSeekable ) )
@@ -267,7 +267,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
if ( !xSeekable.is() )
{
// TODO: wrap stream to let it be seekable
- OSL_FAIL( "Nonseekable streams are not supported for now!\n" );
+ OSL_FAIL( "Nonseekable streams are not supported for now!" );
}
if ( !CheckPackageSignature_Impl( xStream->getInputStream(), xSeekable ) )
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index 1e07f4e492af..8e5b7fc31e6a 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -34,7 +34,7 @@ public:
explicit OStorageFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext )
: m_xContext( xContext )
{
- OSL_ENSURE( xContext.is(), "No service manager is provided!\n" );
+ OSL_ENSURE( xContext.is(), "No service manager is provided!" );
}
static css::uno::Sequence< OUString > SAL_CALL
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index b451a625ecac..470f5671fc5f 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -373,7 +373,7 @@ OStorage_Impl::~OStorage_Impl()
void OStorage_Impl::SetReadOnlyWrap( OStorage& aStorage )
{
// Weak reference is used inside the holder so the refcount must not be zero at this point
- OSL_ENSURE( aStorage.GetRefCount_Impl(), "There must be a reference alive to use this method!\n" );
+ OSL_ENSURE( aStorage.GetRefCount_Impl(), "There must be a reference alive to use this method!" );
m_aReadOnlyWrapList.push_back( StorageHolder_Impl( &aStorage ) );
}
@@ -1135,7 +1135,7 @@ void OStorage_Impl::Commit()
{
if ((*pElementIter)->m_xStorage->m_bCommited)
{
- OSL_ENSURE((*pElementIter)->m_xStorage, "An inserted storage is incomplete!\n");
+ OSL_ENSURE((*pElementIter)->m_xStorage, "An inserted storage is incomplete!");
if (!(*pElementIter)->m_xStorage)
throw uno::RuntimeException( THROW_WHERE );
@@ -1146,7 +1146,7 @@ void OStorage_Impl::Commit()
}
else
{
- OSL_ENSURE((*pElementIter)->m_xStream, "An inserted stream is incomplete!\n");
+ OSL_ENSURE((*pElementIter)->m_xStream, "An inserted stream is incomplete!");
if (!(*pElementIter)->m_xStream)
throw uno::RuntimeException( THROW_WHERE );
@@ -1328,7 +1328,7 @@ SotElement_Impl* OStorage_Impl::InsertStream( const OUString& aName, bool bEncr
uno::Reference< packages::XDataSinkEncrSupport > xPackageSubStream( xNewElement, uno::UNO_QUERY_THROW );
- OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE || !bEncr, "Only package storage supports encryption!\n" );
+ OSL_ENSURE( m_nStorageType == embed::StorageFormats::PACKAGE || !bEncr, "Only package storage supports encryption!" );
if ( m_nStorageType != embed::StorageFormats::PACKAGE && bEncr )
throw packages::NoEncryptionException( THROW_WHERE );
@@ -1800,7 +1800,7 @@ OStorage::OStorage( OStorage_Impl* pImpl, bool bReadOnlyWrap )
: m_pImpl( pImpl )
{
// this call can be done only from OStorage_Impl implementation to create child storage
- OSL_ENSURE( m_pImpl && m_pImpl->m_rMutexRef.is(), "The provided pointer & mutex MUST NOT be empty!\n" );
+ OSL_ENSURE( m_pImpl && m_pImpl->m_rMutexRef.is(), "The provided pointer & mutex MUST NOT be empty!" );
m_pData.reset(new StorInternalData_Impl( m_pImpl->m_rMutexRef, m_pImpl->m_bIsRoot, m_pImpl->m_nStorageType, bReadOnlyWrap));
@@ -1982,7 +1982,7 @@ void OStorage::BroadcastTransaction( sal_Int8 nMessage )
::cppu::OInterfaceIteratorHelper pIterator( *pContainer );
while ( pIterator.hasMoreElements( ) )
{
- OSL_ENSURE( nMessage >= 1 && nMessage <= 4, "Wrong internal notification code is used!\n" );
+ OSL_ENSURE( nMessage >= 1 && nMessage <= 4, "Wrong internal notification code is used!" );
switch( nMessage )
{
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 527238d0a23f..8992e227b24d 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -125,7 +125,7 @@ XUnbufferedStream::XUnbufferedStream(
, mbCheckCRC( false )
{
// for this scenario maEntry is not set !!!
- OSL_ENSURE( mxZipSeek.is(), "The stream must be seekable!\n" );
+ OSL_ENSURE( mxZipSeek.is(), "The stream must be seekable!" );
// skip raw header, it must be already parsed to rData
mnZipCurrent = n_ConstHeaderSize + rData->m_aInitVector.getLength() +
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 695caff3ee10..29cec822a4c6 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -673,7 +673,7 @@ uno::Reference< XInputStream > ZipFile::getDataStream( ZipEntry& rEntry,
// if we have a digest, then this file is an encrypted one and we should
// check if we can decrypt it or not
- OSL_ENSURE( rData->m_aDigest.getLength(), "Can't detect password correctness without digest!\n" );
+ OSL_ENSURE( rData->m_aDigest.getLength(), "Can't detect password correctness without digest!" );
if ( rData->m_aDigest.getLength() && !hasValidPassword ( rEntry, rData ) )
throw packages::WrongPasswordException(THROW_WHERE );
}
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 4be31db59be5..8bb37f161eb8 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1450,7 +1450,7 @@ void SAL_CALL ZipPackage::commitChanges()
// write directly in case of local file
uno::Reference< css::ucb::XSimpleFileAccess3 > xSimpleAccess(
SimpleFileAccess::create( m_xContext ) );
- OSL_ENSURE( xSimpleAccess.is(), "Can't instantiate SimpleFileAccess service!\n" );
+ OSL_ENSURE( xSimpleAccess.is(), "Can't instantiate SimpleFileAccess service!" );
uno::Reference< io::XTruncate > xOrigTruncate;
if ( xSimpleAccess.is() )
{
@@ -1546,7 +1546,7 @@ void ZipPackage::DisconnectFromTargetAndThrowException_Impl( const uno::Referenc
}
catch ( uno::Exception& )
{
- OSL_FAIL( "These calls are pretty simple, they should not fail!\n" );
+ OSL_FAIL( "These calls are pretty simple, they should not fail!" );
}
OUString aErrTxt(THROW_WHERE "This package is read only!");
diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx
index 0673e887d111..c327dfe98c07 100644
--- a/package/source/zippackage/ZipPackageEntry.cxx
+++ b/package/source/zippackage/ZipPackageEntry.cxx
@@ -52,7 +52,7 @@ ZipPackageEntry::ZipPackageEntry()
ZipPackageEntry::~ZipPackageEntry()
{
// When the entry is destroyed it must be already disconnected from the parent
- OSL_ENSURE( !mpParent, "The parent must be disconnected already! Memory corruption is possible!\n" );
+ OSL_ENSURE( !mpParent, "The parent must be disconnected already! Memory corruption is possible!" );
}
// XChild
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index 7f54260bba40..6c91b0302d19 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -357,7 +357,7 @@ uno::Reference< io::XInputStream > ZipPackageStream::TryToGetRawFromDataStream(
bool ZipPackageStream::ParsePackageRawStream()
{
- OSL_ENSURE( GetOwnSeekStream().is(), "A stream must be provided!\n" );
+ OSL_ENSURE( GetOwnSeekStream().is(), "A stream must be provided!" );
if ( !GetOwnSeekStream().is() )
return false;
@@ -590,7 +590,7 @@ bool ZipPackageStream::saveChild(
if ( !bToBeCompressed || m_bRawStream )
{
// The raw stream can neither be encrypted nor connected
- OSL_ENSURE( !m_bRawStream || !(bToBeCompressed || bToBeEncrypted), "The stream is already encrypted!\n" );
+ OSL_ENSURE( !m_bRawStream || !(bToBeCompressed || bToBeEncrypted), "The stream is already encrypted!" );
xSeek->seek ( m_bRawStream ? m_nMagicalHackPos : 0 );
ImplSetStoredData ( *pTempEntry, xStream );
@@ -671,7 +671,7 @@ bool ZipPackageStream::saveChild(
aPropSet[PKG_MNFST_ITERATION].Value <<= m_xBaseEncryptionData->m_nIterationCount;
// Need to store the uncompressed size in the manifest
- OSL_ENSURE( m_nOwnStreamOrigSize >= 0, "The stream size was not correctly initialized!\n" );
+ OSL_ENSURE( m_nOwnStreamOrigSize >= 0, "The stream size was not correctly initialized!" );
aPropSet[PKG_MNFST_UCOMPSIZE].Name = sSizeProperty;
aPropSet[PKG_MNFST_UCOMPSIZE].Value <<= m_nOwnStreamOrigSize;
@@ -958,7 +958,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData()
}
catch ( Exception & )
{
- OSL_FAIL( "Exception is thrown during stream wrapping!\n" );
+ OSL_FAIL( "Exception is thrown during stream wrapping!" );
return uno::Reference < io::XInputStream > ();
}
}
@@ -985,7 +985,7 @@ uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getInputStream()
}
catch ( Exception &ex )
{
- OSL_FAIL( "Exception is thrown during stream wrapping!\n" );
+ OSL_FAIL( "Exception is thrown during stream wrapping!" );
OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr());
(void)ex;
return uno::Reference < io::XInputStream > ();
diff --git a/package/source/zippackage/wrapstreamforshare.cxx b/package/source/zippackage/wrapstreamforshare.cxx
index dbc8d92b5f12..e621455cd224 100644
--- a/package/source/zippackage/wrapstreamforshare.cxx
+++ b/package/source/zippackage/wrapstreamforshare.cxx
@@ -40,7 +40,7 @@ WrapStreamForShare::WrapStreamForShare( const uno::Reference< io::XInputStream >
{
if ( !m_rMutexRef.is() || !m_xInStream.is() )
{
- OSL_FAIL( "Wrong initialization of wrapping stream!\n" );
+ OSL_FAIL( "Wrong initialization of wrapping stream!" );
throw uno::RuntimeException(THROW_WHERE );
}
m_xSeekable.set( m_xInStream, uno::UNO_QUERY_THROW );
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 983bfa6579fc..ce4e82de8867 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -96,7 +96,7 @@ uno::Sequence< OUString > OZipFileAccess::GetPatternsFromString_Impl( const OUSt
}
else
{
- OSL_FAIL( "The backslash is not guarded!\n" );
+ OSL_FAIL( "The backslash is not guarded!" );
aPattern[nInd] += "\\";
}
}
@@ -176,7 +176,7 @@ void SAL_CALL OZipFileAccess::initialize( const uno::Sequence< uno::Any >& aArgu
if ( !aArguments.getLength() )
throw lang::IllegalArgumentException(THROW_WHERE, uno::Reference< uno::XInterface >(), 1 );
- OSL_ENSURE( aArguments.getLength() == 1, "Too many arguments are provided, only the first one will be used!\n" );
+ OSL_ENSURE( aArguments.getLength() == 1, "Too many arguments are provided, only the first one will be used!" );
OUString aParamURL;
uno::Reference< io::XStream > xStream;
@@ -319,7 +319,7 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames()
{
if ( aNames.getLength() < ++nLen )
{
- OSL_FAIL( "The size must be the same!\n" );
+ OSL_FAIL( "The size must be the same!" );
aNames.realloc( nLen );
}
@@ -328,7 +328,7 @@ uno::Sequence< OUString > SAL_CALL OZipFileAccess::getElementNames()
if ( aNames.getLength() != nLen )
{
- OSL_FAIL( "The size must be the same!\n" );
+ OSL_FAIL( "The size must be the same!" );
aNames.realloc( nLen );
}