summaryrefslogtreecommitdiff
path: root/sfx2
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 /sfx2
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 'sfx2')
-rw-r--r--sfx2/source/appl/shutdowniconaqua.mm6
-rw-r--r--sfx2/source/bastyp/fltfnc.cxx2
-rw-r--r--sfx2/source/doc/docfile.cxx12
-rw-r--r--sfx2/source/doc/guisaveas.cxx8
-rw-r--r--sfx2/source/doc/objmisc.cxx2
-rw-r--r--sfx2/source/doc/objserv.cxx4
-rw-r--r--sfx2/source/doc/objstor.cxx16
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx6
-rw-r--r--sfx2/source/view/ipclient.cxx6
9 files changed, 31 insertions, 31 deletions
diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 2b082b6457dd..6100931224f1 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -443,7 +443,7 @@ void aqua_init_systray()
if( [NSApp respondsToSelector: @selector(setDockIconClickHandler:)] )
[NSApp performSelector:@selector(setDockIconClickHandler:) withObject: pExecute];
else
- OSL_FAIL( "setDockIconClickHandler selector failed on NSApp\n" );
+ OSL_FAIL( "setDockIconClickHandler selector failed on NSApp" );
}
@@ -488,10 +488,10 @@ void aqua_init_systray()
[NSApp performSelector:@selector(addDockMenuItem:) withObject: pDockSubMenu];
}
else
- OSL_FAIL( "addDockMenuItem selector failed on NSApp\n" );
+ OSL_FAIL( "addDockMenuItem selector failed on NSApp" );
}
else
- OSL_FAIL( "addFallbackMenuItem selector failed on NSApp\n" );
+ OSL_FAIL( "addFallbackMenuItem selector failed on NSApp" );
}
}
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index e5b6f069163e..1de0c5bead70 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -1150,7 +1150,7 @@ void SfxFilterContainer::ReadFilters_Impl( bool bUpdate )
}
catch(const uno::Exception&)
{
- SAL_WARN( "sfx.bastyp", "SfxFilterContainer::ReadFilter()\nException detected. Possible not all filters could be cached.\n" );
+ SAL_WARN( "sfx.bastyp", "SfxFilterContainer::ReadFilter()\nException detected. Possible not all filters could be cached." );
}
if ( bUpdate )
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 52384b439dd4..d102167352c8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1591,7 +1591,7 @@ bool SfxMedium::StorageCommit_Impl()
// since the temporary file is created always now, the scenario is close to be impossible
if ( !pImpl->pTempFile )
{
- OSL_ENSURE( !pImpl->m_aBackupURL.isEmpty(), "No backup on storage commit!\n" );
+ OSL_ENSURE( !pImpl->m_aBackupURL.isEmpty(), "No backup on storage commit!" );
if ( !pImpl->m_aBackupURL.isEmpty()
&& ::ucbhelper::Content::create( GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE ),
xDummyEnv, comphelper::getProcessComponentContext(),
@@ -1605,7 +1605,7 @@ bool SfxMedium::StorageCommit_Impl()
// connect the medium to the temporary file of the storage
pImpl->aContent = ::ucbhelper::Content();
pImpl->m_aName = aBackupExc.TemporaryFileURL;
- OSL_ENSURE( !pImpl->m_aName.isEmpty(), "The exception _must_ contain the temporary URL!\n" );
+ OSL_ENSURE( !pImpl->m_aName.isEmpty(), "The exception _must_ contain the temporary URL!" );
}
}
}
@@ -2542,7 +2542,7 @@ void SfxMedium::Init_Impl()
|| !pImpl->m_aLogicName.startsWith("private:stream")) )
{
pImpl->m_pSet->ClearItem( SID_OUTPUTSTREAM );
- SAL_WARN( "sfx.doc", "Unexpected Output stream parameter!\n" );
+ SAL_WARN( "sfx.doc", "Unexpected Output stream parameter!" );
}
if (!pImpl->m_aLogicName.isEmpty())
@@ -2977,7 +2977,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
}
else
{
- SAL_WARN( "sfx.doc", "Can not create a new temporary file for crash recovery!\n" );
+ SAL_WARN( "sfx.doc", "Can not create a new temporary file for crash recovery!" );
}
}
}
@@ -3571,7 +3571,7 @@ bool SfxMedium::SignContents_Impl( bool bScriptingContent, const OUString& aODFV
}
catch ( const uno::Exception& )
{
- SAL_WARN( "sfx.doc", "Couldn't use signing functionality!\n" );
+ SAL_WARN( "sfx.doc", "Couldn't use signing functionality!" );
}
CloseAndRelease();
@@ -3597,7 +3597,7 @@ bool SfxMedium::SignContents_Impl( bool bScriptingContent, const OUString& aODFV
}
catch( const uno::Exception& )
{
- SAL_WARN( "sfx.doc", "Couldn't use signing functionality!\n" );
+ SAL_WARN( "sfx.doc", "Couldn't use signing functionality!" );
}
}
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 8744d1e22f53..91f17c39fc1c 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -140,7 +140,7 @@ sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
else if ( nStoreMode == SAVEASREMOTE_REQUESTED )
nResult = SID_SAVEASREMOTE;
else {
- SAL_WARN( "sfx.doc", "Unacceptable slot name is provided!\n" );
+ SAL_WARN( "sfx.doc", "Unacceptable slot name is provided!" );
}
return nResult;
@@ -1425,7 +1425,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
}
else
{
- OSL_FAIL( "XStorable2 is not supported by the model!\n" );
+ OSL_FAIL( "XStorable2 is not supported by the model!" );
aModelData.GetStorable()->store();
}
@@ -1595,7 +1595,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
}
else
{
- SAL_WARN( "sfx.doc", "This code must be unreachable!\n" );
+ SAL_WARN( "sfx.doc", "This code must be unreachable!" );
throw task::ErrorCodeIOException(
"SfxStoringHelper::GUIStoreModel: ERRCODE_IO_INVALIDPARAMETER",
uno::Reference< uno::XInterface >(), ERRCODE_IO_INVALIDPARAMETER);
@@ -1642,7 +1642,7 @@ bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& xMo
bDialogUsed = true;
else
{
- OSL_FAIL( "Can't execute document info dialog!\n" );
+ OSL_FAIL( "Can't execute document info dialog!" );
}
try {
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 79f17cbb4968..c91acbf1b401 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -270,7 +270,7 @@ bool SfxObjectShell::IsModified()
for ( sal_Int32 n=0; n<aNames.getLength(); n++ )
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] );
- OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+ OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!" );
if ( xObj.is() )
{
try
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index c2bdb2e5281a..48903d1346ae 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -198,7 +198,7 @@ bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XCloseab
}
catch( uno::Exception& )
{
- OSL_FAIL( "Could not register close listener!\n" );
+ OSL_FAIL( "Could not register close listener!" );
}
}
@@ -557,7 +557,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
xStatusIndicator = xStatFactory->createStatusIndicator();
}
- OSL_ENSURE( xStatusIndicator.is(), "Can not retrieve default status indicator!\n" );
+ OSL_ENSURE( xStatusIndicator.is(), "Can not retrieve default status indicator!" );
if ( xStatusIndicator.is() )
{
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 2b1e18853400..3ecd5272359c 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -157,7 +157,7 @@ void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >&
}
catch ( uno::Exception& )
{
- SAL_WARN( "sfx.doc", "The document seems to be in the collection already!\n" );
+ SAL_WARN( "sfx.doc", "The document seems to be in the collection already!" );
}
}
@@ -601,7 +601,7 @@ bool SfxObjectShell::ImportFromGeneratedStream_Impl(
SetReadOnlyUI();
bResult = true;
- OSL_ENSURE( pImpl->m_xDocStorage == xStorage, "Wrong storage is used!\n" );
+ OSL_ENSURE( pImpl->m_xDocStorage == xStorage, "Wrong storage is used!" );
}
}
@@ -1387,7 +1387,7 @@ bool SfxObjectShell::SaveTo_Impl
// currently the case that the storage is the same should be impossible
if ( xMedStorage == GetStorage() )
{
- OSL_ENSURE( !pVersionItem, "This scenario is impossible currently!\n" );
+ OSL_ENSURE( !pVersionItem, "This scenario is impossible currently!" );
// usual save procedure
bOk = Save();
}
@@ -1635,7 +1635,7 @@ bool SfxObjectShell::SaveTo_Impl
else if (!pMedium->GetName().isEmpty()
|| ( pMedium->HasStorage_Impl() && pMedium->WillDisposeStorageOnClose_Impl() ) )
{
- OSL_ENSURE(!pMedium->GetName().isEmpty(), "Fallback is used, the medium without name should not dispose the storage!\n");
+ OSL_ENSURE(!pMedium->GetName().isEmpty(), "Fallback is used, the medium without name should not dispose the storage!");
// copy storage of old medium to new temporary storage and take this over
if( !ConnectTmpStorage_Impl( pMedium->GetStorage(), pMedium ) )
{
@@ -2226,7 +2226,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium,
{
OUString aName = aNames[n];
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aName );
- OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+ OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!" );
if ( xObj.is() )
{
sal_Int32 nState = xObj->getCurrentState();
@@ -3024,7 +3024,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage()
{
if ( !pImpl->m_xDocStorage.is() )
{
- OSL_ENSURE( pImpl->m_bCreateTempStor, "The storage must exist already!\n" );
+ OSL_ENSURE( pImpl->m_bCreateTempStor, "The storage must exist already!" );
try {
// no notification is required the storage is set the first time
pImpl->m_xDocStorage = ::comphelper::OStorageHelper::GetTemporaryStorage();
@@ -3092,7 +3092,7 @@ bool SfxObjectShell::SaveCompletedChildren()
for ( sal_Int32 n=0; n<aNames.getLength(); n++ )
{
uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObjectContainer().GetEmbeddedObject( aNames[n] );
- OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!\n" );
+ OSL_ENSURE( xObj.is(), "An empty entry in the embedded objects list!" );
if ( xObj.is() )
{
uno::Reference< embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
@@ -3191,7 +3191,7 @@ bool SfxObjectShell::SaveCompleted( const uno::Reference< embed::XStorage >& xSt
bool StoragesOfUnknownMediaTypeAreCopied_Impl( const uno::Reference< embed::XStorage >& xSource,
const uno::Reference< embed::XStorage >& xTarget )
{
- OSL_ENSURE( xSource.is() && xTarget.is(), "Source and/or target storages are not available!\n" );
+ OSL_ENSURE( xSource.is() && xTarget.is(), "Source and/or target storages are not available!" );
if ( !xSource.is() || !xTarget.is() || xSource == xTarget )
return true;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index bd61032c379c..c7941649ca64 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -380,7 +380,7 @@ SfxOwnFramesLocker::SfxOwnFramesLocker( SfxObjectShell* pObjectShell )
}
catch( Exception& )
{
- OSL_FAIL( "Not possible to lock the frame window!\n" );
+ OSL_FAIL( "Not possible to lock the frame window!" );
}
}
}
@@ -405,7 +405,7 @@ SfxOwnFramesLocker::~SfxOwnFramesLocker()
}
catch( Exception& )
{
- OSL_FAIL( "Can't unlock the frame window!\n" );
+ OSL_FAIL( "Can't unlock the frame window!" );
}
}
}
@@ -2694,7 +2694,7 @@ void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
}
else
{
- OSL_FAIL( "Unexpected scenario!\n" );
+ OSL_FAIL( "Unexpected scenario!" );
}
}
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 9fe365663211..b3fa11e945af 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -598,7 +598,7 @@ void SfxInPlaceClient::SetObjectState( sal_Int32 nState )
if ( m_xImp->m_nAspect == embed::Aspects::MSOLE_ICON
&& ( nState == embed::EmbedStates::UI_ACTIVE || nState == embed::EmbedStates::INPLACE_ACTIVE ) )
{
- OSL_FAIL( "Iconified object should not be activated inplace!\n" );
+ OSL_FAIL( "Iconified object should not be activated inplace!" );
return;
}
@@ -643,7 +643,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
}
catch( uno::Exception& )
{
- OSL_FAIL( "Can not clean the client site!\n" );
+ OSL_FAIL( "Can not clean the client site!" );
}
}
}
@@ -667,7 +667,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
}
catch( uno::Exception& )
{
- OSL_FAIL( "Can not set the client site!\n" );
+ OSL_FAIL( "Can not set the client site!" );
}
m_xImp->m_aTimer.Start();