diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-20 11:08:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-21 09:15:11 +0200 |
commit | 8c8f2a528534c31708028825d327601d7bec804c (patch) | |
tree | c7905b70ed9dac0f53f72eef4efc33e1e7cf1c0d /sw | |
parent | 841e1a6f3619054ecc9240e061cd83d4e41d1ca9 (diff) |
remove unnecessary explicit linefeeds from end of SAL and OSL log calls
Change-Id: I3fa363c8e76e6cfb297f4ec346e3f031c09d6fbf
Reviewed-on: https://gerrit.libreoffice.org/36727
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/ole/ndole.cxx | 8 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfsdrexport.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/xml/swxml.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexti.cxx | 6 | ||||
-rw-r--r-- | sw/source/uibase/table/chartins.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/swcli.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 7c42aa9dd723..154b7105e1c2 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -173,7 +173,7 @@ SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode): { // the link URL was not changed uno::Reference< embed::XEmbeddedObject > xObject = pOleNode->GetOLEObj().GetOleRef(); - OSL_ENSURE( xObject.is(), "The object must exist always!\n" ); + OSL_ENSURE( xObject.is(), "The object must exist always!" ); if ( xObject.is() ) { // let the object reload the link @@ -306,7 +306,7 @@ bool SwOLENode::SavePersistentData() if( p ) { comphelper::EmbeddedObjectContainer& rCnt = p->GetEmbeddedObjectContainer(); - OSL_ENSURE( !pCnt || &rCnt == pCnt, "The helper is assigned to unexpected container!\n" ); + OSL_ENSURE( !pCnt || &rCnt == pCnt, "The helper is assigned to unexpected container!" ); } #endif @@ -524,7 +524,7 @@ bool SwOLENode::UpdateLinkURL_Impl() uno::Reference< embed::XEmbeddedObject > xObj = aOLEObj.xOLERef.GetObject(); uno::Reference< embed::XCommonEmbedPersist > xPersObj( xObj, uno::UNO_QUERY ); - OSL_ENSURE( xPersObj.is(), "The object must exist!\n" ); + OSL_ENSURE( xPersObj.is(), "The object must exist!" ); if ( xPersObj.is() ) { try @@ -789,7 +789,7 @@ SwOLEObj::~SwOLEObj() if( p ) { comphelper::EmbeddedObjectContainer& rCnt = p->GetEmbeddedObjectContainer(); - OSL_ENSURE( !pCnt || &rCnt == pCnt, "The helper is assigned to unexpected container!\n" ); + OSL_ENSURE( !pCnt || &rCnt == pCnt, "The helper is assigned to unexpected container!" ); } #endif diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index a1be3420d4fe..b9d2fe38de4e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3836,7 +3836,7 @@ void DocxAttributeOutput::TableOrientation( ww8::WW8TableNodeInfoInner::Pointer_ void DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t /*pTableTextNodeInfoInner*/ ) { - SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )\n" ); + SAL_INFO("sw.ww8", "TODO: DocxAttributeOutput::TableSpacing( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )" ); } void DocxAttributeOutput::TableRowEnd( sal_uInt32 /*nDepth*/ ) diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index 2719453f4080..17fb699a2310 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -331,7 +331,7 @@ void RtfSdrExport::Commit(EscherPropertyContainer& rProps, const tools::Rectangl case msopathEnd: break; default: - SAL_WARN("sw.rtf", "Totally b0rked\n"); + SAL_WARN("sw.rtf", "Totally b0rked"); break; } } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 01dbc987c4fa..51d46b9bbc49 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -516,7 +516,7 @@ sal_uInt16 SwWW8ImplReader::End_Field() const SvtFilterOptions &rOpt = SvtFilterOptions::Get(); bool bUseEnhFields = rOpt.IsUseEnhancedFields(); - OSL_ENSURE(!m_aFieldStack.empty(), "Empty field stack\n"); + OSL_ENSURE(!m_aFieldStack.empty(), "Empty field stack"); if (!m_aFieldStack.empty()) { /* @@ -861,7 +861,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes) WW8FieldDesc aF; bool bOk = pF->GetPara(pRes->nCp2OrIdx, aF); - OSL_ENSURE(bOk, "WW8: Bad Field!\n"); + OSL_ENSURE(bOk, "WW8: Bad Field!"); if (aF.nId == 33) aF.bCodeNest=false; // do not recurse into nested page fields bool bCodeNest = aF.bCodeNest; if ( aF.nId == 6 ) bCodeNest = false; // We can handle them and lose the inner data diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 2676c7bd52b2..cb2bbd433912 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -748,7 +748,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c // there is ambiguity which medium should be used here // for now the own medium has a preference SfxMedium* pMedDescrMedium = pMedium ? pMedium : pDocSh->GetMedium(); - OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!\n" ); + OSL_ENSURE( pMedDescrMedium, "There is no medium to get MediaDescriptor from!" ); xInfoSet->setPropertyValue( "BaseURI", makeAny( rBaseURL ) ); diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index abb2013709ce..99e032dd4a42 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -343,7 +343,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( catch(const uno::Exception&) { // TODO/LATER: error handling - OSL_FAIL( "Link detection or retrieving of the URL of OOo link is failed!\n" ); + OSL_FAIL( "Link detection or retrieving of the URL of OOo link is failed!" ); } } diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index a1c4e991d50c..f49d42a0d4a5 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -135,7 +135,7 @@ static void lcl_setObjectVisualArea( const uno::Reference< embed::XEmbeddedObjec } catch( uno::Exception& ) { - OSL_FAIL( "Couldn't set visual area of the object!\n" ); + OSL_FAIL( "Couldn't set visual area of the object!" ); } } } @@ -315,7 +315,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( OUString aExistingName = pExistingOLENd->GetOLEObj().GetCurrentPersistName(); if ( aExistingName.equals( aObjName ) ) { - OSL_FAIL( "The document contains duplicate object references, means it is partially broken, please let developers know how this document was generated!\n" ); + OSL_FAIL( "The document contains duplicate object references, means it is partially broken, please let developers know how this document was generated!" ); OUString aTmpName = pDoc->GetPersist()->GetEmbeddedObjectContainer().CreateUniqueObjectName(); try @@ -327,7 +327,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( } catch ( uno::Exception& ) { - OSL_FAIL( "Couldn't create a copy of the object!\n" ); + OSL_FAIL( "Couldn't create a copy of the object!" ); } break; diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index 5689f9517ca9..5717b6c2981b 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -217,7 +217,7 @@ void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings ) } catch (const uno::Exception&) { - OSL_FAIL("Chart wizard couldn't be positioned automatically\n" ); + OSL_FAIL("Chart wizard couldn't be positioned automatically" ); } } diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index 29782e885031..e5dabeb42605 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -125,7 +125,7 @@ void SwOleClient::ViewChanged() } catch (const uno::Exception&) { - OSL_FAIL( "Something goes wrong on requesting object size!\n" ); + OSL_FAIL( "Something goes wrong on requesting object size!" ); } Size aVisSize( aSz.Width, aSz.Height ); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 18139d02318c..79c2f893be64 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -733,13 +733,13 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj, } catch (const embed::NoVisualAreaSizeException&) { - OSL_FAIL("Can't get visual area size!\n" ); + OSL_FAIL("Can't get visual area size!" ); // the scaling will not be done } catch (const uno::Exception&) { // TODO/LATER: handle the error - OSL_FAIL("Can't get visual area size!\n" ); + OSL_FAIL("Can't get visual area size!" ); return; } |