diff options
Diffstat (limited to 'embeddedobj')
-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 | ||||
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/general/dummyobject.cxx | 10 | ||||
-rw-r--r-- | embeddedobj/source/inc/targetstatecontrol.hxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/inc/xcreator.hxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/advisesink.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/closepreventer.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/olecomponent.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/olemisc.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/olepersist.cxx | 16 | ||||
-rw-r--r-- | embeddedobj/source/msole/olevisual.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/olewrapclient.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/xdialogcreator.cxx | 4 | ||||
-rw-r--r-- | embeddedobj/source/msole/xdialogcreator.hxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/msole/xolefactory.hxx | 2 |
18 files changed, 49 insertions, 49 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(); diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 941cb6ff36bf..2a3e733c4b34 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -469,7 +469,7 @@ bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xPar if ( !SetFrameLMVisibility( m_xFrame, false ) ) { - OSL_FAIL( "Can't deactivate LayoutManager!\n" ); + OSL_FAIL( "Can't deactivate LayoutManager!" ); // TODO/LATER: error handling? } diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx index 2ab7a69b0124..5f768df6a7a6 100644 --- a/embeddedobj/source/general/dummyobject.cxx +++ b/embeddedobj/source/general/dummyobject.cxx @@ -204,7 +204,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const ::osl::MutexGuard aGuard( m_aMutex ); CheckInit_WrongState(); - 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!", @@ -221,7 +221,7 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect ) ::osl::MutexGuard aGuard( m_aMutex ); CheckInit_WrongState(); - 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!", @@ -241,7 +241,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect ) ::osl::MutexGuard aGuard( m_aMutex ); CheckInit_Runtime(); - 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!", @@ -373,11 +373,11 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( !m_bWaitSaveCompleted && !bUseNew ) return; - OSL_ENSURE( m_bWaitSaveCompleted, "Unexpected saveCompleted() call!\n" ); + OSL_ENSURE( m_bWaitSaveCompleted, "Unexpected saveCompleted() call!" ); if ( !m_bWaitSaveCompleted ) throw io::IOException(); // TODO: illegal call - OSL_ENSURE( m_xNewParentStorage.is() , "Internal object information is broken!\n" ); + OSL_ENSURE( m_xNewParentStorage.is() , "Internal object information is broken!" ); if ( !m_xNewParentStorage.is() ) throw uno::RuntimeException(); // TODO: broken internal information diff --git a/embeddedobj/source/inc/targetstatecontrol.hxx b/embeddedobj/source/inc/targetstatecontrol.hxx index 6cc999a23d4e..3e099eac115c 100644 --- a/embeddedobj/source/inc/targetstatecontrol.hxx +++ b/embeddedobj/source/inc/targetstatecontrol.hxx @@ -30,7 +30,7 @@ public: TargetStateControl_Impl( sal_Int32& nVariable, sal_Int32 nValue ) : m_nTargetStateVariable( nVariable ) { - OSL_ENSURE( m_nTargetStateVariable == -1, "The target state variable is not initialized properly!\n" ); + OSL_ENSURE( m_nTargetStateVariable == -1, "The target state variable is not initialized properly!" ); m_nTargetStateVariable = nValue; } diff --git a/embeddedobj/source/inc/xcreator.hxx b/embeddedobj/source/inc/xcreator.hxx index 4e0b3630c2b4..23bc62b282e3 100644 --- a/embeddedobj/source/inc/xcreator.hxx +++ b/embeddedobj/source/inc/xcreator.hxx @@ -40,7 +40,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(); diff --git a/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx index fddf462d8963..cea44757d3c7 100644 --- a/embeddedobj/source/msole/advisesink.cxx +++ b/embeddedobj/source/msole/advisesink.cxx @@ -27,7 +27,7 @@ OleWrapperAdviseSink::OleWrapperAdviseSink( OleComponent* pOleComp ) : m_nRefCount( 0 ) , m_pOleComp( pOleComp ) { - OSL_ENSURE( m_pOleComp, "No ole component is provided!\n" ); + OSL_ENSURE( m_pOleComp, "No ole component is provided!" ); } OleWrapperAdviseSink::~OleWrapperAdviseSink() diff --git a/embeddedobj/source/msole/closepreventer.cxx b/embeddedobj/source/msole/closepreventer.cxx index 6a6e35f0d730..2de65e2fbf18 100644 --- a/embeddedobj/source/msole/closepreventer.cxx +++ b/embeddedobj/source/msole/closepreventer.cxx @@ -30,13 +30,13 @@ void SAL_CALL OClosePreventer::queryClosing( const css::lang::EventObject&, sal_ void SAL_CALL OClosePreventer::notifyClosing( const css::lang::EventObject& ) { // just a disaster - OSL_FAIL( "The object can not be prevented from closing!\n" ); + OSL_FAIL( "The object can not be prevented from closing!" ); } void SAL_CALL OClosePreventer::disposing( const css::lang::EventObject& ) { // just a disaster - OSL_FAIL( "The object can not be prevented from closing!\n" ); + OSL_FAIL( "The object can not be prevented from closing!" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 08fef37640d7..8c2dd853adfd 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -434,7 +434,7 @@ OleComponent::OleComponent( const uno::Reference< lang::XMultiServiceFactory >& OSL_ENSURE( m_pUnoOleObject, "No owner object is provided!" ); HRESULT hr = OleInitialize( nullptr ); - OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfully initialized\n" ); + OSL_ENSURE( hr == S_OK || hr == S_FALSE, "The ole can not be successfully initialized" ); if ( hr == S_OK || hr == S_FALSE ) m_bOleInitialized = true; @@ -968,7 +968,7 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ) void OleComponent::RunObject() { - OSL_ENSURE( m_pNativeImpl->m_pOleObject, "The pointer can not be set to NULL here!\n" ); + OSL_ENSURE( m_pNativeImpl->m_pOleObject, "The pointer can not be set to NULL here!" ); if ( !m_pNativeImpl->m_pOleObject ) throw embed::WrongStateException(); // TODO: the object is in wrong state diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx index 4e617d0f4c0a..5dd9c2a0be0e 100644 --- a/embeddedobj/source/msole/olemisc.cxx +++ b/embeddedobj/source/msole/olemisc.cxx @@ -283,7 +283,7 @@ void OleEmbeddedObject::Dispose() if ( m_xObjectStream.is() ) { uno::Reference< lang::XComponent > xComp( m_xObjectStream, uno::UNO_QUERY ); - OSL_ENSURE( xComp.is(), "Storage stream doesn't support XComponent!\n" ); + OSL_ENSURE( xComp.is(), "Storage stream doesn't support XComponent!" ); if ( xComp.is() ) { diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx index 2c0779f288d2..9b1b86359741 100644 --- a/embeddedobj/source/msole/olepersist.cxx +++ b/embeddedobj/source/msole/olepersist.cxx @@ -109,7 +109,7 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory ) { - OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!\n" ); + OSL_ENSURE( xInStream.is() && xFactory.is(), "Wrong parameters are provided!" ); OUString aResult = GetNewTempFileURL_Impl( xFactory ); @@ -363,7 +363,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl( void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream, const uno::Reference< io::XStream >& xCachedVisualRepresentation ) { - OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!\n" ); + OSL_ENSURE( xTargetStream.is() && xCachedVisualRepresentation.is(), "Invalid arguments!" ); if ( !xTargetStream.is() || !xCachedVisualRepresentation.is() ) throw uno::RuntimeException(); @@ -507,7 +507,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream ) { - OSL_ENSURE( xTargetStream.is(), "Invalid argument!\n" ); + OSL_ENSURE( xTargetStream.is(), "Invalid argument!" ); if ( !xTargetStream.is() ) throw uno::RuntimeException(); @@ -551,7 +551,7 @@ bool OleEmbeddedObject::HasVisReplInStream() uno::Reference< io::XInputStream > xStream; - OSL_ENSURE( !m_pOleComponent || !m_aTempURL.isEmpty(), "The temporary file must exist if there is a component!\n" ); + OSL_ENSURE( !m_pOleComponent || !m_aTempURL.isEmpty(), "The temporary file must exist if there is a component!" ); if ( !m_aTempURL.isEmpty() ) { try @@ -1059,7 +1059,7 @@ void OleEmbeddedObject::StoreToLocation_Impl( "The object waits for saveCompleted() call!", static_cast< ::cppu::OWeakObject* >(this) ); - OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" ); + OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!" ); bool bVisReplIsStored = false; @@ -1531,11 +1531,11 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew ) if ( !m_bWaitSaveCompleted && !bUseNew ) return; - SAL_WARN_IF( !m_bWaitSaveCompleted, "embeddedobj.ole", "Unexpected saveCompleted() call!\n" ); + SAL_WARN_IF( !m_bWaitSaveCompleted, "embeddedobj.ole", "Unexpected saveCompleted() call!" ); if ( !m_bWaitSaveCompleted ) throw io::IOException(); // TODO: illegal call - OSL_ENSURE( m_xNewObjectStream.is() && m_xNewParentStorage.is() , "Internal object information is broken!\n" ); + OSL_ENSURE( m_xNewObjectStream.is() && m_xNewParentStorage.is() , "Internal object information is broken!" ); if ( !m_xNewObjectStream.is() || !m_xNewParentStorage.is() ) throw uno::RuntimeException(); // TODO: broken internal information @@ -1704,7 +1704,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn() { bStoreLoaded = false; - OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" ); + OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!" ); if ( !m_xObjectStream.is() ) throw io::IOException(); //TODO: access denied diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx index 329c4fa17457..ace3ee94aa0f 100644 --- a/embeddedobj/source/msole/olevisual.cxx +++ b/embeddedobj/source/msole/olevisual.cxx @@ -93,7 +93,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt if ( m_bDisposed ) throw lang::DisposedException(); // TODO - SAL_WARN_IF( nAspect == embed::Aspects::MSOLE_ICON, "embeddedobj.ole", "For iconified objects no graphical replacement is required!\n" ); + SAL_WARN_IF( nAspect == embed::Aspects::MSOLE_ICON, "embeddedobj.ole", "For iconified objects no graphical replacement is required!" ); if ( nAspect == embed::Aspects::MSOLE_ICON ) // no representation can be retrieved throw embed::WrongStateException( "Illegal call!", @@ -121,7 +121,7 @@ void SAL_CALL OleEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt } catch( const uno::Exception& ) { - SAL_WARN( "embeddedobj.ole", "The object should not be resized without activation!\n" ); + SAL_WARN( "embeddedobj.ole", "The object should not be resized without activation!" ); } aGuard.reset(); } diff --git a/embeddedobj/source/msole/olewrapclient.cxx b/embeddedobj/source/msole/olewrapclient.cxx index 571a6914d716..7abff29ac853 100644 --- a/embeddedobj/source/msole/olewrapclient.cxx +++ b/embeddedobj/source/msole/olewrapclient.cxx @@ -28,7 +28,7 @@ OleWrapperClientSite::OleWrapperClientSite( OleComponent* pOleComp ) : m_nRefCount( 0 ) , m_pOleComp( pOleComp ) { - OSL_ENSURE( m_pOleComp, "No ole component is provided!\n" ); + OSL_ENSURE( m_pOleComp, "No ole component is provided!" ); } OleWrapperClientSite::~OleWrapperClientSite() diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx index 847e48e6f0b3..0954f73672f4 100644 --- a/embeddedobj/source/msole/xdialogcreator.cxx +++ b/embeddedobj/source/msole/xdialogcreator.cxx @@ -264,7 +264,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia else throw ucb::CommandAbortedException(); - OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!\n" ); + OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!" ); if ( !aObjectInfo.Object.is() ) throw uno::RuntimeException(); @@ -308,7 +308,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF // TODO/LATER: in case of iconify object the icon should be stored in aObjectInfo - OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!\n" ); + OSL_ENSURE( aObjectInfo.Object.is(), "No object was created!" ); if ( !aObjectInfo.Object.is() ) throw uno::RuntimeException(); diff --git a/embeddedobj/source/msole/xdialogcreator.hxx b/embeddedobj/source/msole/xdialogcreator.hxx index 5aec4daa17e7..02a8059c094c 100644 --- a/embeddedobj/source/msole/xdialogcreator.hxx +++ b/embeddedobj/source/msole/xdialogcreator.hxx @@ -39,7 +39,7 @@ public: const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) : m_xFactory( xFactory ) { - OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); + OSL_ENSURE( xFactory.is(), "No service manager is provided!" ); } static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); diff --git a/embeddedobj/source/msole/xolefactory.hxx b/embeddedobj/source/msole/xolefactory.hxx index afe8165ffe64..bff4ed6c6d5e 100644 --- a/embeddedobj/source/msole/xolefactory.hxx +++ b/embeddedobj/source/msole/xolefactory.hxx @@ -39,7 +39,7 @@ public: const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) : m_xFactory( xFactory ) { - OSL_ENSURE( xFactory.is(), "No service manager is provided!\n" ); + OSL_ENSURE( xFactory.is(), "No service manager is provided!" ); } static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); |