diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-20 11:08:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 09:15:11 +0200 |
commit | 8c8f2a528534c31708028825d327601d7bec804c (patch) | |
tree | c7905b70ed9dac0f53f72eef4efc33e1e7cf1c0d /embeddedobj/source/commonembedding | |
parent | 841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (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 'embeddedobj/source/commonembedding')
-rw-r--r-- | embeddedobj/source/commonembedding/miscobj.cxx | 12 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/persistence.cxx | 16 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/specialobject.cxx | 8 | ||||
-rw-r--r-- | embeddedobj/source/commonembedding/xfactory.hxx | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx index f6657edc17ce..9cbf770c11da 100644 --- a/embeddedobj/source/commonembedding/miscobj.cxx +++ b/embeddedobj/source/commonembedding/miscobj.cxx @@ -94,7 +94,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedValue >& aObjectProps ) { - OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!\n" ); + OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!" ); if ( !m_xContext.is() ) throw uno::RuntimeException(); @@ -227,7 +227,7 @@ void OCommonEmbeddedObject::LinkInit_Impl( else if ( aMediaDescr[nInd].Name == "FilterName" ) aMediaDescr[nInd].Value >>= m_aLinkFilterName; - OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!\n" ); + OSL_ENSURE( m_aLinkURL.getLength() && m_aLinkFilterName.getLength(), "Filter and URL must be provided!" ); m_bReadOnly = true; if ( m_aLinkFilterName.getLength() ) @@ -295,12 +295,12 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect ) { // the method is called in case object is inplace active and the object window was resized - OSL_ENSURE( m_xClientSite.is(), "The client site must be set for inplace active object!\n" ); + OSL_ENSURE( m_xClientSite.is(), "The client site must be set for inplace active object!" ); if ( m_xClientSite.is() ) { uno::Reference< embed::XInplaceClient > xInplaceClient( m_xClientSite, uno::UNO_QUERY ); - OSL_ENSURE( xInplaceClient.is(), "The client site must support XInplaceClient to allow inplace activation!\n" ); + OSL_ENSURE( xInplaceClient.is(), "The client site must support XInplaceClient to allow inplace activation!" ); if ( xInplaceClient.is() ) { try { @@ -308,7 +308,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect ) } catch( const uno::Exception& ) { - OSL_FAIL( "Exception on request to resize!\n" ); + OSL_FAIL( "Exception on request to resize!" ); } } } @@ -552,7 +552,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership ) if ( m_xObjectStorage.is() ) { uno::Reference< lang::XComponent > xComp( m_xObjectStorage, uno::UNO_QUERY ); - OSL_ENSURE( xComp.is(), "Storage does not support XComponent!\n" ); + OSL_ENSURE( xComp.is(), "Storage does not support XComponent!" ); if ( xComp.is() ) { diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx index 2984036e46b3..fc93ae18db25 100644 --- a/embeddedobj/source/commonembedding/persistence.cxx +++ b/embeddedobj/source/commonembedding/persistence.cxx @@ -978,7 +978,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry( // for now support of this interface is required to allow breaking of links and converting them to normal embedded // objects, so the persist name must be handled correctly ( althowgh no real persist entry is used ) - // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" ); + // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" ); if ( m_bIsLink ) { m_aEntryName = sEntName; @@ -1157,11 +1157,11 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed:: // for now support of this interface is required to allow breaking of links and converting them to normal embedded // objects, so the persist name must be handled correctly ( althowgh no real persist entry is used ) - // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" ); + // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" ); if ( m_bIsLink ) return; - OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!\n" ); + OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!" ); sal_Int32 nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT; sal_Int32 nOriginalStorageFormat = SOFFICE_FILEFORMAT_CURRENT; @@ -1285,14 +1285,14 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed:: // for now support of this interface is required to allow breaking of links and converting them to normal embedded // objects, so the persist name must be handled correctly ( althowgh no real persist entry is used ) - // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" ); + // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" ); if ( m_bIsLink ) { m_aNewEntryName = sEntName; return; } - OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!\n" ); + OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!" ); sal_Int32 nTargetStorageFormat = SOFFICE_FILEFORMAT_CURRENT; sal_Int32 nOriginalStorageFormat = SOFFICE_FILEFORMAT_CURRENT; @@ -1417,7 +1417,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) // for now support of this interface is required to allow breaking of links and converting them to normal embedded // objects, so the persist name must be handled correctly ( althowgh no real persist entry is used ) - // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!\n" ); + // OSL_ENSURE( !m_bIsLink, "This method implementation must not be used for links!" ); if ( m_bIsLink ) { if ( bUseNew ) @@ -1434,7 +1434,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( !m_bWaitSaveCompleted ) throw io::IOException(); // TODO: illegal call - OSL_ENSURE( m_xNewObjectStorage.is() && m_xNewParentStorage.is() , "Internal object information is broken!\n" ); + OSL_ENSURE( m_xNewObjectStorage.is() && m_xNewParentStorage.is() , "Internal object information is broken!" ); if ( !m_xNewObjectStorage.is() || !m_xNewParentStorage.is() ) throw uno::RuntimeException(); // TODO: broken internal information @@ -1569,7 +1569,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn() } else { - OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!\n" ); + OSL_ENSURE( m_xParentStorage.is() && m_xObjectStorage.is(), "The object has no valid persistence!" ); if ( !m_xObjectStorage.is() ) throw io::IOException(); //TODO: access denied diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx index 0fe8fb1cd26c..5b8cdb8c12b6 100644 --- a/embeddedobj/source/commonembedding/specialobject.cxx +++ b/embeddedobj/source/commonembedding/specialobject.cxx @@ -85,7 +85,7 @@ embed::VisualRepresentation SAL_CALL OSpecialEmbeddedObject::getPreferredVisualR throw embed::WrongStateException( "The own object has no model!", static_cast< ::cppu::OWeakObject* >(this) ); - OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); + OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved throw embed::WrongStateException( "Illegal call!", @@ -102,7 +102,7 @@ void SAL_CALL OSpecialEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, cons if ( m_bDisposed ) throw lang::DisposedException(); // TODO - OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); + OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved throw embed::WrongStateException( "Illegal call!", @@ -117,7 +117,7 @@ awt::Size SAL_CALL OSpecialEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect if ( m_bDisposed ) throw lang::DisposedException(); // TODO - OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); + OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved throw embed::WrongStateException( "Illegal call!", @@ -136,7 +136,7 @@ sal_Int32 SAL_CALL OSpecialEmbeddedObject::getMapUnit( sal_Int64 nAspect ) if ( m_bDisposed ) throw lang::DisposedException(); // TODO - OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!\n" ); + OSL_ENSURE( nAspect != embed::Aspects::MSOLE_ICON, "For iconified objects no graphical replacement is required!" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved throw embed::WrongStateException( "Illegal call!", diff --git a/embeddedobj/source/commonembedding/xfactory.hxx b/embeddedobj/source/commonembedding/xfactory.hxx index bfcfe2740ccf..951de92170c3 100644 --- a/embeddedobj/source/commonembedding/xfactory.hxx +++ b/embeddedobj/source/commonembedding/xfactory.hxx @@ -42,7 +42,7 @@ public: : m_xContext( rxContext ) , m_aConfigHelper( rxContext ) { - OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); + OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); @@ -89,7 +89,7 @@ public: : m_xContext( rxContext ) , m_aConfigHelper( rxContext ) { - OSL_ENSURE( rxContext.is(), "No service manager is provided!\n" ); + OSL_ENSURE( rxContext.is(), "No service manager is provided!" ); } static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); |