merge some stringadds

found with a lightly tweaked version of the loplugin:stringadd
and some hand-holding.

Change-Id: I146aadcaf665e98fea89a9cad2df4dc3935622f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152275
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 50 insertions, 50 deletions

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 5c686f1f8c3a..7d7d1e250bff 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -567,21 +567,21 @@ static void lcl_FormatPostIt(
         pIDCO->SplitNode( *aPam.GetPoint(), false );
     }
 
-    OUString aStr( SwViewShell::GetShellRes()->aPostItPage );
-    aStr += sTmp +
+    OUString aStr = SwViewShell::GetShellRes()->aPostItPage +
+        sTmp +
         OUString::number( nPageNo ) +
         " ";
     if( nLineNo )
     {
-        aStr += SwViewShell::GetShellRes()->aPostItLine;
-        aStr += sTmp +
+        aStr += SwViewShell::GetShellRes()->aPostItLine +
+            sTmp +
             OUString::number( nLineNo ) +
             " ";
     }
-    aStr += SwViewShell::GetShellRes()->aPostItAuthor;
-    aStr += sTmp + pField->GetPar1() + " ";
     SvtSysLocale aSysLocale;
-    aStr += /*(LocaleDataWrapper&)*/aSysLocale.GetLocaleData().getDate( pField->GetDate() );
+    aStr += SwViewShell::GetShellRes()->aPostItAuthor +
+        sTmp + pField->GetPar1() + " " +
+        /*(LocaleDataWrapper&)*/aSysLocale.GetLocaleData().getDate( pField->GetDate() );
     if(pField->GetResolved())
         aStr += " " + SwResId(STR_RESOLVED);
     pIDCO->InsertString( aPam, aStr );
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 29eb0408d5bc..a9e75f7f8140 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -535,31 +535,31 @@ MakeUndoReplaceRewriter(sal_uLong const occurrences,
         aResult.AddRule(UndoArg1, OUString::number(occurrences));
         aResult.AddRule(UndoArg2, SwResId(STR_OCCURRENCES_OF));
 
-        OUString aTmpStr = SwResId(STR_START_QUOTE);
-        aTmpStr += ShortenString(sOld, nUndoStringLength,
-                                 SwResId(STR_LDOTS));
-        aTmpStr += SwResId(STR_END_QUOTE);
+        OUString aTmpStr =
+            SwResId(STR_START_QUOTE)
+            + ShortenString(sOld, nUndoStringLength, SwResId(STR_LDOTS))
+            + SwResId(STR_END_QUOTE);
         aResult.AddRule(UndoArg3, aTmpStr);
     }
     else if (1 == occurrences)
     {
         {
-            OUString aTmpStr = SwResId(STR_START_QUOTE);
             // #i33488 #
-            aTmpStr += ShortenString(sOld, nUndoStringLength,
-                                     SwResId(STR_LDOTS));
-            aTmpStr += SwResId(STR_END_QUOTE);
+            OUString aTmpStr =
+                SwResId(STR_START_QUOTE)
+                + ShortenString(sOld, nUndoStringLength, SwResId(STR_LDOTS))
+                + SwResId(STR_END_QUOTE);
             aResult.AddRule(UndoArg1, aTmpStr);
         }
 
         aResult.AddRule(UndoArg2, SwResId(STR_YIELDS));
 
         {
-            OUString aTmpStr = SwResId(STR_START_QUOTE);
             // #i33488 #
-            aTmpStr += ShortenString(sNew, nUndoStringLength,
-                                     SwResId(STR_LDOTS));
-            aTmpStr += SwResId(STR_END_QUOTE);
+            OUString aTmpStr =
+                SwResId(STR_START_QUOTE)
+                + ShortenString(sNew, nUndoStringLength, SwResId(STR_LDOTS))
+                + SwResId(STR_END_QUOTE);
             aResult.AddRule(UndoArg3, aTmpStr);
         }
     }
@@ -998,10 +998,10 @@ SwRewriter SwUndoInsertLabel::CreateRewriter(const OUString &rStr)
 
     if (!rStr.isEmpty())
     {
-        aTmpStr += SwResId(STR_START_QUOTE);
-        aTmpStr += ShortenString(rStr, nUndoStringLength,
-                                 SwResId(STR_LDOTS));
-        aTmpStr += SwResId(STR_END_QUOTE);
+        aTmpStr =
+            SwResId(STR_START_QUOTE)
+            + ShortenString(rStr, nUndoStringLength, SwResId(STR_LDOTS))
+            + SwResId(STR_END_QUOTE);
     }
 
     aRewriter.AddRule(UndoArg1, aTmpStr);
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 1780a6182fdf..59ed71f198bc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -198,8 +198,7 @@ static OString OutBorderLine(RtfExport const& rExport, const editeng::SvxBorderL
                              const char* pStr, sal_uInt16 nDist,
                              SvxShadowLocation eShadowLocation = SvxShadowLocation::NONE)
 {
-    OStringBuffer aRet;
-    aRet.append(OutTBLBorderLine(rExport, pLine, pStr));
+    OStringBuffer aRet(OutTBLBorderLine(rExport, pLine, pStr));
     if (pLine)
     {
         aRet.append(OOO_STRING_SVTOOLS_RTF_BRSP + OString::number(static_cast<sal_Int32>(nDist)));
@@ -528,10 +527,9 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 /*nPos*/,
                                    const SwFormatRuby& rRuby)
 {
     WW8Ruby aWW8Ruby(rNode, rRuby, GetExport());
-    OUString aStr(FieldString(ww::eEQ) + "\\* jc");
-    aStr += OUString::number(aWW8Ruby.GetJC()) + " \\* \"Font:" + aWW8Ruby.GetFontFamily()
-            + "\" \\* hps";
-    aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o";
+    OUString aStr = FieldString(ww::eEQ) + "\\* jc" + OUString::number(aWW8Ruby.GetJC())
+                    + " \\* \"Font:" + aWW8Ruby.GetFontFamily() + "\" \\* hps"
+                    + OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o";
     if (aWW8Ruby.GetDirective())
     {
         aStr += "\\a" + OUStringChar(aWW8Ruby.GetDirective());
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 71f33f3a7d14..8b7a6195be1f 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -894,10 +894,15 @@ const SfxPoolItem& SwWW8AttrIter::GetItem(sal_uInt16 nWhich) const
 void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/, const SwFormatRuby& rRuby )
 {
     WW8Ruby aWW8Ruby(rNode, rRuby, GetExport());
-    OUString aStr( FieldString( ww::eEQ ) + "\\* jc" );
-    aStr += OUString::number(aWW8Ruby.GetJC()) + " \\* \"Font:" + aWW8Ruby.GetFontFamily()
-        + "\" \\* hps";
-    aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o";
+    OUString aStr =
+        FieldString( ww::eEQ )
+        + "\\* jc"
+        + OUString::number(aWW8Ruby.GetJC())
+        + " \\* \"Font:"
+        + aWW8Ruby.GetFontFamily()
+        + "\" \\* hps"
+        + OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10)
+        + " \\o";
     if (aWW8Ruby.GetDirective())
     {
         aStr += OUString::Concat(u"\\a") + OUStringChar(aWW8Ruby.GetDirective());
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 31b24dc02005..b6a9cd1e9499 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -556,9 +556,9 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol )
     {
         SvXMLElementExport aElem( *this, XML_NAMESPACE_STYLE, XML_STYLE, true,
                                   true );
-        OUStringBuffer sValue;
         if( rCol.GetWidthOpt() )
         {
+            OUStringBuffer sValue;
             GetTwipUnitConverter().convertMeasureToXML( sValue,
                     rCol.GetWidthOpt() );
             AddAttribute( XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH,
@@ -566,10 +566,9 @@ void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol )
         }
         if( rCol.GetRelWidth() )
         {
-            sValue.append( static_cast<sal_Int32>(rCol.GetRelWidth()) );
-            sValue.append( '*' );
+            OUString sValue = OUString::number(static_cast<sal_Int32>(rCol.GetRelWidth()) ) + "*";
             AddAttribute( XML_NAMESPACE_STYLE, XML_REL_COLUMN_WIDTH,
-                          sValue.makeStringAndClear() );
+                          sValue );
         }
 
         {
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 0efbd852df7d..bafd9570a726 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -492,8 +492,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
             case IsAttrAtPos::RefMark:
                 if(aContentAtPos.aFnd.pAttr)
                 {
-                    sText = SwResId(STR_CONTENT_TYPE_SINGLE_REFERENCE) + ": ";
-                    sText += static_cast<const SwFormatRefMark*>(aContentAtPos.aFnd.pAttr)->GetRefName();
+                    sText = SwResId(STR_CONTENT_TYPE_SINGLE_REFERENCE) + ": " +
+                        static_cast<const SwFormatRefMark*>(aContentAtPos.aFnd.pAttr)->GetRefName();
                 }
             break;
 
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 7cfce2b14438..0a936b67f311 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -421,12 +421,13 @@ void SwSrcView::GetState(SfxItemSet& rSet)
             break;
             case SID_TABLE_CELL:
             {
-                OUString aPos( SwResId(STR_SRCVIEW_ROW) );
                 TextSelection aSel = pTextView->GetSelection();
-                aPos += OUString::number( aSel.GetEnd().GetPara()+1 );
-                aPos += " : " +
-                    SwResId(STR_SRCVIEW_COL);
-                aPos += OUString::number( aSel.GetEnd().GetIndex()+1 );
+                OUString aPos =
+                    SwResId(STR_SRCVIEW_ROW)
+                    + OUString::number( aSel.GetEnd().GetPara()+1 )
+                    + " : "
+                    + SwResId(STR_SRCVIEW_COL)
+                    + OUString::number( aSel.GetEnd().GetIndex()+1 );
                 SvxStatusItem aItem( SID_TABLE_CELL, aPos, StatusCategory::RowColumn );
                 rSet.Put( aItem );
             }
@@ -475,8 +476,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
                     nCount = rMgr.GetUndoActionCount();
                     if(nCount)
                     {
-                        OUString aStr(SvtResId( STR_UNDO));
-                        aStr += rMgr.GetUndoActionComment(--nCount);
+                        OUString aStr = SvtResId( STR_UNDO) + rMgr.GetUndoActionComment(--nCount);
                         rSet.Put(SfxStringItem(nWhich, aStr));
                     }
                     else
@@ -487,8 +487,7 @@ void SwSrcView::GetState(SfxItemSet& rSet)
                     nCount = rMgr.GetRedoActionCount();
                     if(nCount)
                     {
-                        OUString aStr(SvtResId( STR_REDO));
-                        aStr += rMgr.GetRedoActionComment(--nCount);
+                        OUString aStr = SvtResId( STR_REDO) + rMgr.GetRedoActionComment(--nCount);
                         rSet.Put(SfxStringItem(nWhich,aStr));
                     }
                     else
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 1df6910a2a20..45dcfddb0be4 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1967,8 +1967,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 if( rShell.IsCursorInTable() )
                 {
                     // table name + cell coordinate
-                    sStr = rShell.GetTableFormat()->GetName() + ":";
-                    sStr += rShell.GetBoxNms();
+                    sStr = rShell.GetTableFormat()->GetName() + ":" + rShell.GetBoxNms();
                     eCategory = StatusCategory::TableCell;
                 }
                 else