avmedia/source/framework/modeltools.cxx | 6 +- avmedia/source/vlc/vlcuno.cxx | 4 - basic/source/uno/dlgcont.cxx | 6 +- basic/source/uno/scriptcont.cxx | 4 - comphelper/source/container/embeddedobjectcontainer.cxx | 20 +++--- comphelper/source/misc/mimeconfighelper.cxx | 2 connectivity/source/drivers/evoab2/NStatement.cxx | 2 connectivity/source/drivers/firebird/Blob.cxx | 3 - connectivity/source/drivers/macab/MacabGroup.cxx | 2 cppcanvas/source/mtfrenderer/emfppen.cxx | 2 cppu/source/threadpool/threadpool.cxx | 4 - cui/source/dialogs/insdlg.cxx | 2 dbaccess/source/filter/xml/xmlfilter.cxx | 2 embeddedobj/source/commonembedding/miscobj.cxx | 12 ++-- embeddedobj/source/commonembedding/persistence.cxx | 16 ++--- embeddedobj/source/commonembedding/specialobject.cxx | 8 +- embeddedobj/source/commonembedding/xfactory.hxx | 4 - embeddedobj/source/general/docholder.cxx | 2 embeddedobj/source/general/dummyobject.cxx | 10 +-- embeddedobj/source/inc/targetstatecontrol.hxx | 2 embeddedobj/source/inc/xcreator.hxx | 2 embeddedobj/source/msole/advisesink.cxx | 2 embeddedobj/source/msole/closepreventer.cxx | 4 - embeddedobj/source/msole/olecomponent.cxx | 4 - embeddedobj/source/msole/olemisc.cxx | 2 embeddedobj/source/msole/olepersist.cxx | 16 ++--- embeddedobj/source/msole/olevisual.cxx | 4 - embeddedobj/source/msole/olewrapclient.cxx | 2 embeddedobj/source/msole/xdialogcreator.cxx | 4 - embeddedobj/source/msole/xdialogcreator.hxx | 2 embeddedobj/source/msole/xolefactory.hxx | 2 embedserv/source/embed/docholder.cxx | 2 embedserv/source/embed/ed_ipersiststr.cxx | 4 - embedserv/source/embed/servprov.cxx | 4 - extensions/test/ole/cpnt/cpnt.cxx | 2 filter/source/config/cache/querytokenizer.cxx | 4 - filter/source/msfilter/mscodec.cxx | 6 +- filter/source/msfilter/msdffimp.cxx | 2 filter/source/msfilter/msoleexp.cxx | 6 +- jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 2 l10ntools/source/merge.cxx | 2 lotuswordpro/source/filter/lwpfoundry.cxx | 2 lotuswordpro/source/filter/lwpfrib.cxx | 4 - odk/examples/cpp/counter/countermain.cxx | 2 oox/source/core/binarycodec.cxx | 6 +- oox/source/export/vmlexport.cxx | 2 package/source/xstor/ocompinstream.cxx | 2 package/source/xstor/oseekinstream.cxx | 4 - package/source/xstor/owriteablestream.cxx | 30 +++++----- package/source/xstor/switchpersistencestream.cxx | 2 package/source/xstor/xfactory.cxx | 16 ++--- package/source/xstor/xfactory.hxx | 2 package/source/xstor/xstorage.cxx | 12 ++-- package/source/zipapi/XUnbufferedStream.cxx | 2 package/source/zipapi/ZipFile.cxx | 2 package/source/zippackage/ZipPackage.cxx | 4 - package/source/zippackage/ZipPackageEntry.cxx | 2 package/source/zippackage/ZipPackageStream.cxx | 10 +-- package/source/zippackage/wrapstreamforshare.cxx | 2 package/source/zippackage/zipfileaccess.cxx | 8 +- sc/source/core/data/dpshttab.cxx | 2 sc/source/core/tool/parclass.cxx | 2 sc/source/filter/excel/tokstack.cxx | 2 sc/source/filter/oox/sheetdatacontext.cxx | 4 - sc/source/filter/oox/workbookfragment.cxx | 8 +- sc/source/filter/qpro/qpro.cxx | 2 sc/source/filter/xml/xmlwrap.cxx | 4 - sc/source/ui/app/client.cxx | 2 sc/source/ui/docshell/docsh.cxx | 2 sc/source/ui/docshell/docsh4.cxx | 4 - sc/source/ui/docshell/docsh8.cxx | 4 - sc/source/ui/drawfunc/fuins2.cxx | 4 - sc/source/ui/miscdlgs/sharedocdlg.cxx | 2 scripting/source/stringresource/stringresource.cxx | 2 sd/source/filter/eppt/pptx-epptooxml.cxx | 2 sd/source/ui/framework/configuration/ResourceFactoryManager.cxx | 4 - sd/source/ui/remotecontrol/Communicator.cxx | 2 sd/source/ui/remotecontrol/OSXBluetooth.mm | 2 sd/source/ui/view/viewshel.cxx | 2 sdext/source/pdfimport/pdfiadaptor.cxx | 2 sfx2/source/appl/shutdowniconaqua.mm | 6 +- sfx2/source/bastyp/fltfnc.cxx | 2 sfx2/source/doc/docfile.cxx | 12 ++-- sfx2/source/doc/guisaveas.cxx | 8 +- sfx2/source/doc/objmisc.cxx | 2 sfx2/source/doc/objserv.cxx | 4 - sfx2/source/doc/objstor.cxx | 16 ++--- sfx2/source/doc/sfxbasemodel.cxx | 6 +- sfx2/source/view/ipclient.cxx | 6 +- sot/source/sdstor/stg.cxx | 2 svl/source/fsstor/fsstorage.cxx | 4 - svl/source/inc/fsfactory.hxx | 2 svl/source/passwordcontainer/passwordcontainer.cxx | 30 +++++----- svtools/source/config/test/test.cxx | 4 - svtools/source/control/ctrlbox.cxx | 4 - svtools/source/hatchwindow/hatchwindow.cxx | 6 +- svtools/source/hatchwindow/ipwin.cxx | 2 svtools/source/misc/embedhlp.cxx | 2 svtools/source/misc/embedtransfer.cxx | 2 svx/source/svdraw/svdoole2.cxx | 10 +-- svx/source/unodraw/unoshap4.cxx | 2 sw/source/core/ole/ndole.cxx | 8 +- sw/source/filter/ww8/docxattributeoutput.cxx | 2 sw/source/filter/ww8/rtfsdrexport.cxx | 2 sw/source/filter/ww8/ww8par5.cxx | 4 - sw/source/filter/xml/swxml.cxx | 2 sw/source/filter/xml/xmltexte.cxx | 2 sw/source/filter/xml/xmltexti.cxx | 6 +- sw/source/uibase/table/chartins.cxx | 2 sw/source/uibase/uiview/swcli.cxx | 2 sw/source/uibase/wrtsh/wrtsh1.cxx | 4 - toolkit/source/helper/vclunohelper.cxx | 4 - tools/source/stream/stream.cxx | 2 ucb/source/ucp/gio/gio_content.cxx | 10 +-- ucbhelper/source/client/content.cxx | 2 unotools/source/config/cmdoptions.cxx | 2 unotools/source/config/compatibility.cxx | 2 unotools/source/config/configitem.cxx | 14 ++-- unotools/source/config/dynamicmenuoptions.cxx | 2 unotools/source/config/moduleoptions.cxx | 4 - unotools/source/config/viewoptions.cxx | 12 ++-- vcl/quartz/ctfonts.cxx | 2 vcl/quartz/salgdi.cxx | 8 +- vcl/quartz/salgdiutils.cxx | 2 vcl/source/app/svdata.cxx | 2 vcl/source/gdi/configsettings.cxx | 2 vcl/unx/generic/app/saldisp.cxx | 4 - vcl/unx/generic/dtrans/X11_transferable.cxx | 2 vcl/unx/generic/fontmanager/fontmanager.cxx | 2 vcl/workben/svpclient.cxx | 2 xmloff/source/meta/MetaExportComponent.cxx | 2 xmloff/source/meta/xmlversion.cxx | 2 xmlscript/test/imexp.cxx | 2 133 files changed, 306 insertions(+), 309 deletions(-)
New commits: commit 8c8f2a528534c31708028825d327601d7bec804c Author: Noel Grandin <[email protected]> Date: Thu Apr 20 11:08:35 2017 +0200 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 <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index d2d5380af9cd..ab78d0d0b544 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -74,7 +74,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(".kmz"); if( !bIsDAE && !bIsKMZ ) { - SAL_WARN("avmedia.opengl", "KmzDae2Gltf converter got a file with wrong extension\n" << rSourceURL); + SAL_WARN("avmedia.opengl", "KmzDae2Gltf converter got a file with wrong extension " << rSourceURL); return false; } @@ -108,7 +108,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) } catch (const uno::Exception&) { - SAL_WARN("avmedia.opengl", "Exception while trying to copy source file to the temp folder for conversion:\n" << sInput); + SAL_WARN("avmedia.opengl", "Exception while trying to copy source file to the temp folder for conversion: " << sInput); return false; } } @@ -121,7 +121,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) lcl_UnzipKmz(sInput, sOutput, sDaeFilePath); if ( sDaeFilePath.isEmpty() ) { - SAL_WARN("avmedia.opengl", "Cannot find dae file in kmz:\n" << rSourceURL); + SAL_WARN("avmedia.opengl", "Cannot find the file in kmz: " << rSourceURL); return false; } diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx index b5ceea23fb0c..0c505696261a 100644 --- a/avmedia/source/vlc/vlcuno.cxx +++ b/avmedia/source/vlc/vlcuno.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star; static uno::Reference< uno::XInterface > SAL_CALL create_MediaPlayer( const uno::Reference< lang::XMultiServiceFactory >& rxFact ) { - SAL_INFO("avmedia", "create VLC Media player !\n"); + SAL_INFO("avmedia", "create VLC Media player !"); // Experimental for now - code is neither elegant nor well tested. uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); @@ -52,7 +52,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL avmediavlc_component_getFactory( if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) return nullptr; - SAL_INFO("avmedia", "Create VLC Media component: '" << pImplName << "'\n"); + SAL_INFO("avmedia", "Create VLC Media component: " << pImplName); if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 ) { const OUString aServiceName( SERVICE_NAME ); diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 4bc038033534..201f873c4742 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -271,7 +271,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement //Reference< XMultiServiceFactory > xMSF( comphelper::getProcessServiceFactory() ); //if( !xMSF.is() ) //{ - // OSL_FAIL( "### couldn't get ProcessServiceFactory\n" ); + // OSL_FAIL( "### couldn't get ProcessServiceFactory" ); // return aRetAny; //} @@ -282,7 +282,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement UNO_QUERY ); if( !xDialogModel.is() ) { - OSL_FAIL( "### couldn't create com.sun.star.awt.UnoControlDialogModel component\n" ); + OSL_FAIL( "### couldn't create com.sun.star.awt.UnoControlDialogModel component" ); return aRetAny; } @@ -321,7 +321,7 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement } catch(const Exception& ) { - OSL_FAIL( "Parsing error\n" ); + OSL_FAIL( "Parsing error" ); SfxErrorContext aEc( ERRCTX_SFX_LOADBASIC, aFile ); ErrorHandler::HandleError( ERRCODE_IO_GENERAL ); return aRetAny; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index a574aa7f7996..cecbdcfbe1fa 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -681,7 +681,7 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons } catch(const uno::Exception& ) { - OSL_FAIL( "Problem on storing of password library!\n" ); + OSL_FAIL( "Problem on storing of password library!" ); // TODO: error handling } } @@ -898,7 +898,7 @@ bool SfxScriptLibraryContainer::implLoadPasswordLibrary } catch(const uno::Exception& ) { - OSL_FAIL( "### couldn't open sub storage for library\n" ); + OSL_FAIL( "### couldn't open sub storage for library" ); return false; } } diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index f1d8e2bd7d99..89068adafc19 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -179,7 +179,7 @@ void EmbeddedObjectContainer::ReleaseImageSubStorage() } catch (const uno::Exception&) { - SAL_WARN( "comphelper.container", "Problems releasing image substorage!\n" ); + SAL_WARN( "comphelper.container", "Problems releasing image substorage!" ); } } } @@ -786,7 +786,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb { // impossibility to copy readonly property is not treated as an error for now // but the assertion is helpful to detect such scenarios and review them - SAL_WARN( "comphelper.container", "Could not copy readonly property!\n" ); + SAL_WARN( "comphelper.container", "Could not copy readonly property!" ); } } } @@ -811,7 +811,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb } } - SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no persistence!\n" ); + SAL_WARN_IF( !xResult.is(), "comphelper.container", "Can not copy embedded object that has no persistence!" ); if ( xResult.is() ) { @@ -992,7 +992,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed static const OUStringLiteral s_sMediaType("MediaType"); xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType; - SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No valuable media type in the storage!\n" ); + SAL_WARN_IF( aOrigStorMediaType.isEmpty(), "comphelper.container", "No valuable media type in the storage!" ); uno::Reference< beans::XPropertySet > xTargetStorProps( pImpl->mpTempObjectContainer->pImpl->mxStorage, @@ -1001,7 +1001,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed } catch (const uno::Exception&) { - SAL_WARN( "comphelper.container", "Can not set the new media type to a storage!\n" ); + SAL_WARN( "comphelper.container", "Can not set the new media type to a storage!" ); } } @@ -1221,7 +1221,7 @@ namespace { const uno::Reference< io::XInputStream >& xInStream, const OUString& aStreamName ) { - OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!\n" ); + OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!" ); try { @@ -1243,7 +1243,7 @@ namespace { } catch (const uno::Exception&) { - SAL_WARN( "comphelper.container", "The images storage is not available!\n" ); + SAL_WARN( "comphelper.container", "The images storage is not available!" ); } } @@ -1261,7 +1261,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool _bCreateEm for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); - SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" ); + SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!" ); if ( xObj.is() ) { bool bSwitchBackToLoaded = false; @@ -1381,7 +1381,7 @@ bool EmbeddedObjectContainer::StoreChildren(bool _bOasisFormat,bool _bObjectsOnl for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); - SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" ); + SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!" ); if ( xObj.is() ) { sal_Int32 nCurState = xObj->getCurrentState(); @@ -1528,7 +1528,7 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed:: for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); - SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" ); + SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!" ); if ( xObj.is() ) { uno::Reference< embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index a24e4abe764b..b4d05a5fcd48 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -637,7 +637,7 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( break; } - OSL_ENSURE( !aDocName.isEmpty(), "The name must exist at this point!\n" ); + OSL_ENSURE( !aDocName.isEmpty(), "The name must exist at this point!" ); bool bNeedsAddition = true; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 386952c0a265..e931026400ec 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -579,7 +579,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql ) { - SAL_INFO( "connectivity.evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" ); + SAL_INFO( "connectivity.evoab2", "OCommonStatement::impl_executeQuery_throw " << _rSql ); #if OSL_DEBUG_LEVEL > 1 g_message( "Parse SQL '%s'\n", diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 25975c8764c5..be4922d7f33c 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -125,8 +125,7 @@ void SAL_CALL Blob::disposing() catch (SQLException &e) { // we cannot throw any exceptions here... - SAL_WARN("connectivity.firebird", "isc_close_blob failed\n" << - e.Message); + SAL_WARN("connectivity.firebird", "isc_close_blob failed " << e.Message); assert(false); } Blob_BASE::disposing(); diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx index ab25b4789efe..d963d64a7e2d 100644 --- a/connectivity/source/drivers/macab/MacabGroup.cxx +++ b/connectivity/source/drivers/macab/MacabGroup.cxx @@ -81,7 +81,7 @@ MacabGroup::MacabGroup(const ABAddressBookRef _addressBook, const MacabRecords * } } } - OSL_ENSURE(bFound, "MacabGroup::MacabGroup : Could not find group member based on UID!\n"); + OSL_ENSURE(bFound, "MacabGroup::MacabGroup : Could not find group member based on UID!"); CFRelease(sGroupMemberUID); } } diff --git a/cppcanvas/source/mtfrenderer/emfppen.cxx b/cppcanvas/source/mtfrenderer/emfppen.cxx index 229e9c945a36..12f08610a0c7 100755 --- a/cppcanvas/source/mtfrenderer/emfppen.cxx +++ b/cppcanvas/source/mtfrenderer/emfppen.cxx @@ -87,7 +87,7 @@ namespace cppcanvas { #if OSL_DEBUG_LEVEL > 1 if (width == 0.0) { - SAL_INFO("cppcanvas.emf", "TODO: pen with zero width - using minimal which might not be correct\n"); + SAL_INFO("cppcanvas.emf", "TODO: pen with zero width - using minimal which might not be correct"); } #endif rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform * rR.MapSize(width == 0.0 ? 0.05 : width, 0)).getLength()); diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx index 17492c6eb2ad..a508f56e6aec 100644 --- a/cppu/source/threadpool/threadpool.cxx +++ b/cppu/source/threadpool/threadpool.cxx @@ -60,7 +60,7 @@ namespace cppu_threadpool DisposedCallerAdmin::~DisposedCallerAdmin() { - SAL_WARN_IF( !m_lst.empty(), "cppu.threadpool", "DisposedCallerList : " << m_lst.size() << " left\n"); + SAL_WARN_IF( !m_lst.empty(), "cppu.threadpool", "DisposedCallerList : " << m_lst.size() << " left"); } void DisposedCallerAdmin::dispose( sal_Int64 nDisposeId ) @@ -107,7 +107,7 @@ namespace cppu_threadpool ThreadPool::~ThreadPool() { - SAL_WARN_IF( m_mapQueue.size(), "cppu.threadpool", "ThreadIdHashMap: " << m_mapQueue.size() << " left\n"); + SAL_WARN_IF( m_mapQueue.size(), "cppu.threadpool", "ThreadIdHashMap: " << m_mapQueue.size() << " left"); } void ThreadPool::dispose( sal_Int64 nDisposeId ) diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 6b0e88856f63..512cf89f908b 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -120,7 +120,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, Button*, void) } catch( const IllegalArgumentException& ) { - SAL_WARN( "cui.dialogs", "caught IllegalArgumentException when registering filter\n" ); + SAL_WARN( "cui.dialogs", "caught IllegalArgumentException when registering filter" ); } if( xFilePicker->execute() == ExecutableDialogResults::OK ) diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index e8436b8432ad..4f2b59dc0ccc 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -112,7 +112,7 @@ sal_Int32 ReadThroughComponent( catch (const SAXParseException& r) { #if OSL_DEBUG_LEVEL > 0 - SAL_WARN("dbaccess", "SAX parse exception catched while importing:\n" << r.Message << r.LineNumber << "," << r.ColumnNumber); + SAL_WARN("dbaccess", "SAX parse exception catched while importing: " << r.Message << r.LineNumber << "," << r.ColumnNumber); #else (void)r; #endif 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(); diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 6bb68fed3891..076c5b6b8ec5 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -860,7 +860,7 @@ void DocumentHolder::show() } catch( const uno::Exception& ) { - OSL_FAIL( "Can not show the frame!\n" ); + OSL_FAIL( "Can not show the frame!" ); } } diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index dc8a36ccd2bf..6b610785443f 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -569,7 +569,7 @@ STDMETHODIMP EmbedDocument_Impl::Load( IStorage *pStg ) hr = pStg->DestroyElement( reinterpret_cast<LPCWSTR>(aOfficeEmbedStreamName.getStr()) ); hr = pStg->DestroyElement( reinterpret_cast<LPCWSTR>(aExtentStreamName.getStr()) ); - OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!\n" ); + OSL_ENSURE( SUCCEEDED( hr ), "Can not destroy created stream!" ); if ( FAILED( hr ) ) hr = E_FAIL; } @@ -587,7 +587,7 @@ STDMETHODIMP EmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad ) if ( !fSameAsLoad && pStgSave != m_pMasterStorage ) { - OSL_ENSURE( m_pMasterStorage, "How could the document be initialized without storage!??\n" ); + OSL_ENSURE( m_pMasterStorage, "How could the document be initialized without storage!??" ); HRESULT hr = m_pMasterStorage->CopyTo( NULL, nullptr, nullptr, pStgSave ); if ( FAILED( hr ) ) return E_FAIL; diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index 291c164e5d6a..407dc1e2e8ff 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -70,13 +70,13 @@ CurThreadData::~CurThreadData() bool CurThreadData::setData(void *pData) { - OSL_ENSURE( m_hKey, "No thread key!\n" ); + OSL_ENSURE( m_hKey, "No thread key!" ); return (osl_setThreadKeyData(m_hKey, pData)); } void *CurThreadData::getData() { - OSL_ENSURE( m_hKey, "No thread key!\n" ); + OSL_ENSURE( m_hKey, "No thread key!" ); return (osl_getThreadKeyData(m_hKey)); } diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx index 2eb8f55aa101..41608410959f 100644 --- a/extensions/test/ole/cpnt/cpnt.cxx +++ b/extensions/test/ole/cpnt/cpnt.cxx @@ -350,7 +350,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, } catch(InvalidRegistryException &) { - OSL_FAIL( "### InvalidRegistryException!\n"); + OSL_FAIL( "### InvalidRegistryException!"); } } return sal_False; diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index 84ec1ba60bff..cb2b3744fc2f 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -39,7 +39,7 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery) if (equal == 0) m_bValid = false; - OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nFound non boolean query parameter ... but its key is empty. Will be ignored!\n"); + OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer() Found non boolean query parameter ... but its key is empty. Will be ignored!"); OUString sKey; OUString sVal; @@ -53,7 +53,7 @@ QueryTokenizer::QueryTokenizer(const OUString& sQuery) if (find(sKey) != end()) m_bValid = false; - OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nQuery contains same param more than once. Last one wins :-)\n"); + OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer() Query contains same param more than once. Last one wins :-)"); (*this)[sKey] = sVal; } diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index f6a4a575bcc4..83dee6c37223 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -176,7 +176,7 @@ bool MSCodec_Xor95::InitCodec( const uno::Sequence< beans::NamedValue >& aData ) mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault("XOR95PasswordHash", (sal_Int16)0 ); } else - OSL_FAIL( "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!" ); return bResult; } @@ -315,10 +315,10 @@ bool MSCodec97::InitCodec( const uno::Sequence< beans::NamedValue >& aData ) lcl_PrintDigest(m_aDocId.data(), "DocId value"); } else - OSL_FAIL( "Unexpected document ID!\n" ); + OSL_FAIL( "Unexpected document ID!" ); } else - OSL_FAIL( "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!" ); return bResult; } diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index b27da930012e..52b5df44ff81 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7215,7 +7215,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage( } catch( const uno::Exception& ) { - OSL_FAIL( "Could not set visual area of the object!\n" ); + OSL_FAIL( "Could not set visual area of the object!" ); } } diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx index 7f8ca54ec11a..b3bbcd5d7f9b 100644 --- a/filter/source/msfilter/msoleexp.cxx +++ b/filter/source/msfilter/msoleexp.cxx @@ -108,7 +108,7 @@ bool UseOldMSExport() { } - OSL_FAIL( "Could not get access to configuration entry!\n" ); + OSL_FAIL( "Could not get access to configuration entry!" ); return false; } @@ -244,13 +244,13 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotSt } catch( const embed::NoVisualAreaSizeException& ) { - OSL_FAIL( "Could not get visual area size!\n" ); + OSL_FAIL( "Could not get visual area size!" ); aSize.Width = 5000; aSize.Height = 5000; } catch( const uno::Exception& ) { - OSL_FAIL( "Unexpected exception while getting visual area size!\n" ); + OSL_FAIL( "Unexpected exception while getting visual area size!" ); aSize.Width = 5000; aSize.Height = 5000; } diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 3e236bd04c27..85f31a383fc6 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -410,7 +410,7 @@ SelfTest::SelfTest() if (bRet) JFW_TRACE2("Testing class SunVersion succeeded."); else - OSL_ENSURE(bRet, "[Java framework] sunjavaplugin: SunVersion self test failed.\n"); + OSL_ENSURE(bRet, "[Java framework] sunjavaplugin: SunVersion self test failed."); } #endif diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 955fca630d2e..5a928f7ca7ae 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -47,7 +47,7 @@ namespace } catch (const PoIfstream::Exception&) { - SAL_WARN("l10ntools", rFileName.getStr() << " contains invalid entry\n"); + SAL_WARN("l10ntools", rFileName.getStr() << " contains invalid entry"); return false; } return true; diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx index 6c22b9377465..f9a7bc85647c 100644 --- a/lotuswordpro/source/filter/lwpfoundry.cxx +++ b/lotuswordpro/source/filter/lwpfoundry.cxx @@ -168,7 +168,7 @@ void LwpFoundry::RegisterAllLayouts() { if (m_bRegisteredAll) { - OSL_FAIL("recursive LwpFoundry::RegisterAllLayouts!\n"); + OSL_FAIL("recursive LwpFoundry::RegisterAllLayouts!"); return; } diff --git a/lotuswordpro/source/filter/lwpfrib.cxx b/lotuswordpro/source/filter/lwpfrib.cxx index e9542e488c75..68ddcc544da5 100644 --- a/lotuswordpro/source/filter/lwpfrib.cxx +++ b/lotuswordpro/source/filter/lwpfrib.cxx @@ -339,7 +339,7 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo) case FRIB_MTAG_FONT: if (len != sizeof(pModInfo->FontID)) { - OSL_FAIL("FRIB_MTAG_FONT entry wrong size\n"); + OSL_FAIL("FRIB_MTAG_FONT entry wrong size"); pObjStrm->SeekRel(len); } else @@ -356,7 +356,7 @@ void LwpFrib::ReadModifiers(LwpObjectStream* pObjStrm,ModifierInfo* pModInfo) case FRIB_MTAG_CODEPAGE: if (len != sizeof(pModInfo->CodePage)) { - OSL_FAIL("FRIB_MTAG_CODEPAGE entry wrong size\n"); + OSL_FAIL("FRIB_MTAG_CODEPAGE entry wrong size"); pObjStrm->SeekRel(len); } else diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx index 72ce6b4f729f..5a613f588f32 100644 --- a/odk/examples/cpp/counter/countermain.cxx +++ b/odk/examples/cpp/counter/countermain.cxx @@ -65,7 +65,7 @@ SAL_IMPLEMENT_MAIN() try { Reference< XComponentContext > xContext(::cppu::defaultBootstrap_InitialComponentContext()); - OSL_ENSURE( xContext.is(), "### bootstrap failed!\n" ); + OSL_ENSURE( xContext.is(), "### bootstrap failed!" ); Reference< XMultiComponentFactory > xMgr = xContext->getServiceManager(); OSL_ENSURE( xMgr.is(), "### cannot get initial service manager!" ); diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx index 30573e3c8c90..72ae862a0f14 100644 --- a/oox/source/core/binarycodec.cxx +++ b/oox/source/core/binarycodec.cxx @@ -176,7 +176,7 @@ bool BinaryCodec_XOR::initCodec( const uno::Sequence< beans::NamedValue >& aData mnHash = (sal_uInt16)aHashData.getUnpackedValueOrDefault("XOR95PasswordHash", (sal_Int16)0 ); } else - OSL_FAIL( "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!" ); return bResult; } @@ -239,10 +239,10 @@ bool BinaryCodec_RCF::initCodec( const uno::Sequence< beans::NamedValue >& aData bResult = false; } else - OSL_FAIL( "Unexpected document ID!\n" ); + OSL_FAIL( "Unexpected document ID!" ); } else - OSL_FAIL( "Unexpected key size!\n" ); + OSL_FAIL( "Unexpected key size!" ); return bResult; } diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index 89d8e5bfb95c..aa814c460f51 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -545,7 +545,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle& aPath.append( "e" ); break; default: - SAL_WARN("oox", "Totally b0rked\n"); + SAL_WARN("oox", "Totally b0rked"); break; case msopathInvalid: SAL_WARN("oox", "Invalid - should never be found"); 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 ); } diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index c65eb9841a67..a42443da47a1 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -286,7 +286,7 @@ const ScDPCache* ScSheetSourceDesc::CreateCache(const ScDPDimensionSaveData* pDi sal_uLong nErrId = CheckSourceRange(); if (nErrId) { - OSL_FAIL( "Error Create Cache\n" ); + OSL_FAIL( "Error Create Cache" ); return nullptr; } diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 2be37c1bfe6a..26b4c92d2796 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -610,7 +610,7 @@ void ScParameterClassification::GenerateDocumentation() break; default:; } - SAL_INFO( "sc.core", "" << aStr << "\n"); + SAL_INFO( "sc.core", "" << aStr); } } fflush( stdout); diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 70c4c683c44f..dc810ee82104 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -924,7 +924,7 @@ ScMatrix* TokenPool::GetMatrix( unsigned int n ) const if( n < nP_MatrixAkt ) return ppP_Matrix[ n ]; else - SAL_WARN("sc.filter", "GetMatrix: " << n << " >= " << nP_MatrixAkt << "\n"); + SAL_WARN("sc.filter", "GetMatrix: " << n << " >= " << nP_MatrixAkt); return nullptr; } diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 189cd233266a..84fcabfcd6ce 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -74,12 +74,12 @@ SheetDataContext::SheetDataContext( WorksheetFragmentBase& rFragment ) : mnRow( -1 ), mnCol( -1 ) { - SAL_INFO( "sc.filter", "start safe sheet data context - unlock\n" ); + SAL_INFO( "sc.filter", "start safe sheet data context - unlock" ); } SheetDataContext::~SheetDataContext() { - SAL_INFO( "sc.filter", "end safe sheet data context - relock\n" ); + SAL_INFO( "sc.filter", "end safe sheet data context - relock" ); } ContextHandlerRef SheetDataContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 04162147c20c..bab9691aa933 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -238,16 +238,16 @@ public: // We hold the solar mutex in all threads except for // the small safe section of the inner loop in // sheetdatacontext.cxx - SAL_INFO( "sc.filter", "start wait on solar\n" ); + SAL_INFO( "sc.filter", "start wait on solar" ); SolarMutexGuard aGuard; - SAL_INFO( "sc.filter", "got solar\n" ); + SAL_INFO( "sc.filter", "got solar" ); std::unique_ptr<oox::core::FastParser> xParser( oox::core::XmlFilterBase::createParser() ); - SAL_INFO( "sc.filter", "start import\n" ); + SAL_INFO( "sc.filter", "start import" ); mrWorkbookHandler.importOoxFragment( mxHandler, *xParser ); - SAL_INFO( "sc.filter", "end import, release solar\n" ); + SAL_INFO( "sc.filter", "end import, release solar" ); mrSheetsLeft--; assert( mrSheetsLeft >= 0 ); if( mrSheetsLeft == 0 ) diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 97b2081cdde1..b0810e7c69e1 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -42,7 +42,7 @@ FltError ScQProReader::readSheet( SCTAB nTab, ScDocument* pDoc, ScQProStyle *pSt sal_uInt16 nStyle; bool bEndOfSheet = false; - SAL_INFO("sc", "Read sheet " << nTab << "\n"); + SAL_INFO("sc", "Read sheet " << nTab); while( eERR_OK == eRet && !bEndOfSheet && nextRecord() ) { diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 668531eccb51..8eaa8b9a8b9b 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -346,7 +346,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError ) } // Set base URI - OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); + OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!" ); OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : OUString(); // needed for relative URLs, but in clipboard copy/paste there may be none SAL_INFO_IF(aBaseURL.isEmpty(), "sc.filter", "ScXMLImportWrapper: no base URL"); @@ -785,7 +785,7 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) const OUString sTargetStorage("TargetStorage"); xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) ); - OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" ); + OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!" ); OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : OUString(); OUString sPropName("BaseURI"); xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) ); diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 9713669bf8b6..4f9cf7abe31b 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -202,7 +202,7 @@ void ScClient::ViewChanged() aSz = xObj->getVisualAreaSize( GetAspect() ); } catch ( embed::NoVisualAreaSizeException& ) { - OSL_FAIL("The visual area size must be available!\n"); + OSL_FAIL("The visual area size must be available!"); } MapUnit aMapUnit = VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( GetAspect() ) ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 16d128a2882b..e9369c93def8 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -918,7 +918,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } catch ( uno::Exception& ) { - OSL_FAIL( "SfxEventHintId::SaveDoc: caught exception\n" ); + OSL_FAIL( "SfxEventHintId::SaveDoc: caught exception" ); SC_MOD()->SetInSharedDocSaving( false ); try diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 135034c784e7..33d175ea5553 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1081,7 +1081,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } catch ( uno::Exception& ) { - OSL_FAIL( "SID_SHARE_DOC: caught exception\n" ); + OSL_FAIL( "SID_SHARE_DOC: caught exception" ); SC_MOD()->SetInSharedDocSaving( false ); try @@ -2465,7 +2465,7 @@ uno::Reference< frame::XModel > ScDocShell::LoadSharedDocument() } catch ( uno::Exception& ) { - OSL_FAIL( "ScDocShell::LoadSharedDocument(): caught exception\n" ); + OSL_FAIL( "ScDocShell::LoadSharedDocument(): caught exception" ); SC_MOD()->SetInSharedDocLoading( false ); try { diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 71e8a86b8865..d43e851763e8 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -1071,7 +1071,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi } nLen = aOString.getLength(); if (!bTest) - SAL_WARN("sc", "ScDocShell::DBaseExport encoding error, string with default replacements: ``" << aString << "''\n"); + SAL_WARN("sc", "ScDocShell::DBaseExport encoding error, string with default replacements: ``" << aString << "''"); } else nLen = aString.getLength() * sizeof(sal_Unicode); @@ -1080,7 +1080,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi pColLengths[nCol] < nLen) { bTest = false; - SAL_INFO("sc", "ScDocShell::DBaseExport: field width: " << pColLengths[nCol] << ", encoded length: " << nLen << "\n"); + SAL_INFO("sc", "ScDocShell::DBaseExport: field width: " << pColLengths[nCol] << ", encoded length: " << nLen); } } else diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 9d006f7f8e23..25bac55420c2 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -397,7 +397,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawView* } catch( uno::Exception& ) { - OSL_FAIL( "May need error handling here!\n" ); + OSL_FAIL( "May need error handling here!" ); } } else @@ -694,7 +694,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, vcl::Window* pWin, ScDrawV } catch( uno::Exception& ) { - OSL_FAIL( "Chart wizard couldn't be positioned automatically\n" ); + OSL_FAIL( "Chart wizard couldn't be positioned automatically" ); } } diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 4add1fb94faf..b9b672fd2756 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -197,7 +197,7 @@ void ScShareDocumentDlg::UpdateView() } catch ( uno::Exception& ) { - OSL_FAIL( "ScShareDocumentDlg::UpdateView(): caught exception\n" ); + OSL_FAIL( "ScShareDocumentDlg::UpdateView(): caught exception" ); m_pLbUsers->Clear(); m_pLbUsers->InsertEntry( m_aStrNoUserData ); } diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx index 09d5250f17ca..9e7615321cda 100644 --- a/scripting/source/stringresource/stringresource.cxx +++ b/scripting/source/stringresource/stringresource.cxx @@ -956,7 +956,7 @@ void StringResourcePersistenceImpl::implStoreAtStorage OUString aMime("text/plain"); uno::Reference< beans::XPropertySet > xProps( xElementStream, uno::UNO_QUERY ); - OSL_ENSURE( xProps.is(), "The StorageStream must implement XPropertySet interface!\n" ); + OSL_ENSURE( xProps.is(), "The StorageStream must implement XPropertySet interface!" ); if ( xProps.is() ) { xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) ); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index a2a9e5216fd9..b4ba29f8c2ad 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -1861,7 +1861,7 @@ void PowerPointExport::WriteShapeTree( const FSHelperPtr& pFS, PageType ePageTyp } if ( GetShapeByIndex( GetCurrentGroupIndex(), true ) ) { - SAL_INFO("sd.eppt", "mType: \"" << mType.getStr() << "\"\n"); + SAL_INFO("sd.eppt", "mType: " << mType); aDML.WriteShape( mXShape ); } } diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 15ce1e9fdfa0..6b7d73cc4d65 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -82,9 +82,7 @@ void ResourceFactoryManager::AddFactory ( maFactoryPatternList.push_back(FactoryPatternList::value_type(rsURL, rxFactory)); #if defined VERBOSE && VERBOSE>=1 - SAL_INFO("sd",("ResourceFactoryManager::AddFactory pattern %s %x\n", - OUStringToOString(rsURL, RTL_TEXTENCODING_UTF8).getStr(), - rxFactory.get()); + SAL_INFO("sd","ResourceFactoryManager::AddFactory pattern " << rsURL << std::hex << rxFactory.get()); #endif } else diff --git a/sd/source/ui/remotecontrol/Communicator.cxx b/sd/source/ui/remotecontrol/Communicator.cxx index f983937554ac..43e069d0e2fa 100644 --- a/sd/source/ui/remotecontrol/Communicator.cxx +++ b/sd/source/ui/remotecontrol/Communicator.cxx @@ -114,7 +114,7 @@ void Communicator::execute() } } - SAL_INFO ("sdremote", "Exiting transmission loop\n"); + SAL_INFO ("sdremote", "Exiting transmission loop"); disposeListener(); diff --git a/sd/source/ui/remotecontrol/OSXBluetooth.mm b/sd/source/ui/remotecontrol/OSXBluetooth.mm index e90e29d46217..4ccf696809f3 100644 --- a/sd/source/ui/remotecontrol/OSXBluetooth.mm +++ b/sd/source/ui/remotecontrol/OSXBluetooth.mm @@ -37,7 +37,7 @@ { (void) rfcommChannel; - SAL_INFO( "sdremote.bluetooth", "ChannelDelegate::rfcommChannelClosed()\n"); + SAL_INFO( "sdremote.bluetooth", "ChannelDelegate::rfcommChannelClosed()"); if ( pSocket ) { diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index f54d8df16cd1..e997b80f3fee 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1398,7 +1398,7 @@ void ViewShell::ExecReq( SfxRequest& rReq ) css::uno::Reference<css::accessibility::XAccessible> ViewShell::CreateAccessibleDocumentView (::sd::Window* ) { - OSL_FAIL("ViewShell::CreateAccessibleDocumentView should not be called!, perhaps Meyers, 3rd edition, Item 9:\n"); + OSL_FAIL("ViewShell::CreateAccessibleDocumentView should not be called!, perhaps Meyers, 3rd edition, Item 9:"); return css::uno::Reference<css::accessibility::XAccessible> (); } diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 77a71c1927f9..7a00abf6b4ac 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -157,7 +157,7 @@ sal_Bool SAL_CALL PDFIHybridAdaptor::filter( const uno::Sequence< beans::Propert catch(const uno::Exception& e) { (void)e; - SAL_INFO("sdext.pdfimport", "subfilter exception: " << e.Message << "\n"); + SAL_INFO("sdext.pdfimport", "subfilter exception: " << e.Message); } SAL_INFO("sdext.pdfimport", "subfilter: " << xSubFilter.get() ); 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 ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
