diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-28 10:35:49 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-28 12:07:54 +0100 |
commit | bc539bd3c04964471af6b5ca54264215c8995696 (patch) | |
tree | c37af5b9fb3dc0b8677fc8dd535fb8e93ad6039d /sw | |
parent | 9f78a4174e5099ad3af65a23e158a51c1afca54d (diff) |
loplugin:stringadd improve detection
if one side of the expression is a compile-time-constant, we don't need
to worry about side-effects on the other side
Change-Id: Iee71ea51b327ef244bf39f128f921ac325d74e2b
Reviewed-on: https://gerrit.libreoffice.org/81589
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/layout/layout.cxx | 7 | ||||
-rw-r--r-- | sw/qa/extras/rtfexport/rtfexport2.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/doc/dbgoutsw.cxx | 75 | ||||
-rw-r--r-- | sw/source/filter/html/htmlnumwriter.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/xml/xmltexte.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 22 |
6 files changed, 52 insertions, 61 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index d8cef7ef98aa..5b90067a174f 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3168,10 +3168,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlap) // <bounds left="1984" top="1984" width="1137" height="1137"/> // <bounds left="2551" top="2551" width="1137" height="1137"/> // so there was a clear vertical overlap. (Allow for 1px tolerance.) - OString aMessage("Unexpected overlap: first shape's bottom is "); - aMessage += OString::number(pFirst->GetObjRect().Bottom()); - aMessage += ", second shape's top is "; - aMessage += OString::number(pSecond->GetObjRect().Top()); + OString aMessage = "Unexpected overlap: first shape's bottom is " + + OString::number(pFirst->GetObjRect().Bottom()) + ", second shape's top is " + + OString::number(pSecond->GetObjRect().Top()); CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), std::abs(pFirst->GetObjRect().Bottom() - pSecond->GetObjRect().Top()) < 15); diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx index c90f4ca201db..ff63ac7db40f 100644 --- a/sw/qa/extras/rtfexport/rtfexport2.cxx +++ b/sw/qa/extras/rtfexport/rtfexport2.cxx @@ -746,8 +746,7 @@ DECLARE_RTFEXPORT_TEST(testFdo52989, "fdo52989.rtf") { // Same as n#192129, but for JPEG files. uno::Reference<drawing::XShape> xShape = getShape(1); - OString aMessage("xShape->getSize().Width() = "); - aMessage += OString::number(xShape->getSize().Width); + OString aMessage = "xShape->getSize().Width() = " + OString::number(xShape->getSize().Width); // This was 2, should be 423 (or 369?). CPPUNIT_ASSERT_MESSAGE(aMessage.getStr(), xShape->getSize().Width >= 273); diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 62cd9e4da77e..26792bd8e3a0 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -279,15 +279,14 @@ const char * dbg_out(const SfxItemSet & rSet) static OUString lcl_dbg_out(const SwTextAttr & rAttr) { - OUString aStr("[ "); - - aStr += OUString::number(rAttr.GetStart()); - aStr += "->"; - aStr += OUString::number(*rAttr.End()); - aStr += " "; - aStr += lcl_dbg_out(rAttr.GetAttr()); - - aStr += " ]"; + OUString aStr = + "[ " + + OUString::number(rAttr.GetStart()) + + "->" + + OUString::number(*rAttr.End()) + + " " + + lcl_dbg_out(rAttr.GetAttr()) + + " ]"; return aStr; } @@ -320,16 +319,14 @@ const char * dbg_out(const SwpHints &rHints) static OUString lcl_dbg_out(const SwPosition & rPos) { - OUString aStr("( "); - - aStr += OUString::number(rPos.nNode.GetIndex()); - aStr += ", "; - aStr += OUString::number(rPos.nContent.GetIndex()); - aStr += ": "; - aStr += OUString::number - (reinterpret_cast<sal_IntPtr>(rPos.nContent.GetIdxReg()), 16); - - aStr += " )"; + OUString aStr = + "( " + + OUString::number(rPos.nNode.GetIndex()) + + ", " + + OUString::number(rPos.nContent.GetIndex()) + + ": " + + OUString::number(reinterpret_cast<sal_IntPtr>(rPos.nContent.GetIdxReg()), 16) + + " )"; return aStr; } @@ -341,9 +338,9 @@ const char * dbg_out(const SwPosition & rPos) static OUString lcl_dbg_out(const SwPaM & rPam) { - OUString aStr("[ Pt: "); - - aStr += lcl_dbg_out(*rPam.GetPoint()); + OUString aStr = + "[ Pt: " + + lcl_dbg_out(*rPam.GetPoint()); if (rPam.HasMark()) { @@ -373,17 +370,16 @@ const char * dbg_out(const SwNodeNum & rNum) static OUString lcl_dbg_out(const SwRect & rRect) { - OUString aResult("[ ["); - - aResult += OUString::number(rRect.Left()); - aResult += ", "; - aResult += OUString::number(rRect.Top()); - aResult += "], ["; - aResult += OUString::number(rRect.Right()); - aResult += ", "; - aResult += OUString::number(rRect.Bottom()); - - aResult += "] ]"; + OUString aResult = + "[ [" + + OUString::number(rRect.Left()) + + ", " + + OUString::number(rRect.Top()) + + "], [" + + OUString::number(rRect.Right()) + + ", " + + OUString::number(rRect.Bottom()) + + "] ]"; return aResult; } @@ -857,13 +853,12 @@ const char * dbg_out(const SwFormTokens & rTokens) static OUString lcl_dbg_out(const SwNodeRange & rRange) { - OUString aStr("["); - - aStr += lcl_dbg_out(SwPosition(rRange.aStart)); - aStr += ", "; - aStr += lcl_dbg_out(SwPosition(rRange.aEnd)); - - aStr += "]"; + OUString aStr = + "[" + + lcl_dbg_out(SwPosition(rRange.aStart)) + + ", " + + lcl_dbg_out(SwPosition(rRange.aEnd)) + + "]"; return aStr; } diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx index cb21883db528..0d20869ee8be 100644 --- a/sw/source/filter/html/htmlnumwriter.cxx +++ b/sw/source/filter/html/htmlnumwriter.cxx @@ -186,8 +186,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt, rWrt.OutNewLine(); // <OL>/<UL> in a new row rWrt.m_aBulletGrfs[i].clear(); - OString sOut = "<"; - sOut += rWrt.GetNamespace(); + OString sOut = "<" + rWrt.GetNamespace(); const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get( i ); sal_Int16 eType = rNumFormat.GetNumberingType(); if( SVX_NUM_CHAR_SPECIAL == eType ) diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx index b2ae6f5ff08c..509784e78818 100644 --- a/sw/source/filter/xml/xmltexte.cxx +++ b/sw/source/filter/xml/xmltexte.cxx @@ -561,8 +561,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded( } if( SV_EMBEDDED_OUTPLACE==nType || SV_EMBEDDED_OWN==nType ) { - OUString sURL(XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE); - sURL += rOLEObj.GetCurrentPersistName(); + OUString sURL = XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE + rOLEObj.GetCurrentPersistName(); if( !(rXMLExport.getExportFlags() & SvXMLExportFlags::EMBEDDED) ) { sURL = GetExport().AddEmbeddedObject( sURL ); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index c127143bf848..2fa0ee8a4055 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -272,8 +272,8 @@ void SAL_CALL SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::Da return; OUString aOwnURL = pDocShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::WithCharset); - OUString sTmpName = "vnd.sun.star.pkg://"; - sTmpName += INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All); + OUString sTmpName = "vnd.sun.star.pkg://" + + INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY, INetURLObject::EncodeMechanism::All); sTmpName += "/" + m_pDBManager->getEmbeddedName(); if (sTmpName != rEvent.OldLocation) @@ -2625,15 +2625,15 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType) break; case DBConnURIType::CALC: { - OUString sDBURL("sdbc:calc:"); - sDBURL += rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); + OUString sDBURL = "sdbc:calc:" + + rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); aURLAny <<= sDBURL; } break; case DBConnURIType::WRITER: { - OUString sDBURL("sdbc:writer:"); - sDBURL += rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); + OUString sDBURL = "sdbc:writer:" + + rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE); aURLAny <<= sDBURL; } break; @@ -2642,8 +2642,8 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType) INetURLObject aUrlTmp(rURL); aUrlTmp.removeSegment(); aUrlTmp.removeFinalSlash(); - OUString sDBURL("sdbc:dbase:"); - sDBURL += aUrlTmp.GetMainURL(INetURLObject::DecodeMechanism::NONE); + OUString sDBURL = "sdbc:dbase:" + + aUrlTmp.GetMainURL(INetURLObject::DecodeMechanism::NONE); aURLAny <<= sDBURL; } break; @@ -2652,9 +2652,9 @@ uno::Any GetDBunoURI(const INetURLObject &rURL, DBConnURIType& rType) INetURLObject aUrlTmp(rURL); aUrlTmp.removeSegment(); aUrlTmp.removeFinalSlash(); - OUString sDBURL("sdbc:flat:"); - //only the 'path' has to be added - sDBURL += aUrlTmp.GetMainURL(INetURLObject::DecodeMechanism::NONE); + OUString sDBURL = "sdbc:flat:" + + //only the 'path' has to be added + aUrlTmp.GetMainURL(INetURLObject::DecodeMechanism::NONE); aURLAny <<= sDBURL; } break; |