From 539c75b910f518a1fe51e9a21f6368a91c69ed88 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 11 Jul 2017 15:55:02 +0200 Subject: strip some linefeeds from the end of debug output Change-Id: I2821969d86b7f8cee53404e6a0acfbebbe53b3ac Reviewed-on: https://gerrit.libreoffice.org/39824 Tested-by: Jenkins Reviewed-by: Noel Grandin --- package/source/xstor/owriteablestream.cxx | 2 +- package/source/xstor/xstorage.cxx | 8 ++++---- package/source/zippackage/ZipPackage.cxx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'package') diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 2cc0f85f96f8..6bee879b5a75 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -1533,7 +1533,7 @@ void OWriteStream_Impl::CommitStreamRelInfo( const uno::Reference< embed::XStora if ( m_nStorageType == embed::StorageFormats::OFOPXML ) { OSL_ENSURE( !aOrigStreamName.isEmpty() && !aNewStreamName.isEmpty() && xRelStorage.is(), - "Wrong relation persistence information is provided!\n" ); + "Wrong relation persistence information is provided!" ); if ( !xRelStorage.is() || aOrigStreamName.isEmpty() || aNewStreamName.isEmpty() ) throw uno::RuntimeException(); diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index cf67ee18ca8d..569bd30f86c0 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -985,7 +985,7 @@ void OStorage_Impl::Commit() throw embed::InvalidStorageException( THROW_WHERE ); OSL_ENSURE( m_nStorageMode & embed::ElementModes::WRITE, - "Commit of readonly storage, should be detected before!\n" ); + "Commit of readonly storage, should be detected before!" ); uno::Reference< container::XNameContainer > xNewPackageFolder; @@ -1804,7 +1804,7 @@ OStorage::OStorage( OStorage_Impl* pImpl, bool bReadOnlyWrap ) OSL_ENSURE( ( m_pImpl->m_nStorageMode & embed::ElementModes::WRITE ) == embed::ElementModes::WRITE || m_pData->m_bReadOnlyWrap, - "The wrapper can not allow writing in case implementation does not!\n" ); + "The wrapper can not allow writing in case implementation does not!" ); if ( !bReadOnlyWrap ) m_pImpl->m_pAntiImpl = this; @@ -1843,7 +1843,7 @@ void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl ) if ( m_pData->m_bReadOnlyWrap ) { OSL_ENSURE( !m_pData->m_aOpenSubComponentsList.size() || m_pData->m_pSubElDispListener.get(), - "If any subelements are open the listener must exist!\n" ); + "If any subelements are open the listener must exist!" ); if (m_pData->m_pSubElDispListener.get()) { @@ -2006,7 +2006,7 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const OUString& aStreamName, ::osl::MutexGuard aGuard( m_pData->m_xSharedMutex->GetMutex() ); OSL_ENSURE( !m_pData->m_bReadOnlyWrap || ( nOpenMode & embed::ElementModes::WRITE ) != embed::ElementModes::WRITE, - "An element can not be opened for writing in readonly storage!\n" ); + "An element can not be opened for writing in readonly storage!" ); SotElement_Impl *pElement = m_pImpl->FindElement( aStreamName ); if ( !pElement ) diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 71e412a74fe9..7f998ccf01ec 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -327,7 +327,7 @@ void ZipPackage::parseManifest() if ( !bManifestParsed && !m_bForceRecovery ) throw ZipIOException( - THROW_WHERE "Could not parse manifest.xml\n" ); + THROW_WHERE "Could not parse manifest.xml" ); const OUString sMimetype ("mimetype"); if ( m_xRootFolder->hasByName( sMimetype ) ) @@ -1039,7 +1039,7 @@ void ZipPackage::WriteContentTypes( ZipOutputStream& aZipOut, const vector< uno: OUString aPath; OUString aType; OSL_ENSURE( ( *aIter )[PKG_MNFST_MEDIATYPE].Name == "MediaType" && ( *aIter )[PKG_MNFST_FULLPATH].Name == "FullPath", - "The mediatype sequence format is wrong!\n" ); + "The mediatype sequence format is wrong!" ); ( *aIter )[PKG_MNFST_MEDIATYPE].Value >>= aType; if ( !aType.isEmpty() ) { -- cgit