loplugin:stringadd

tweak the plugin to be more permissive, then validate by hand
afterwards

Change-Id: I40c5c911fe6ff7e45baaca372abf7dac211d9654
Reviewed-on: https://gerrit.libreoffice.org/81942
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 30 insertions, 33 deletions

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 1ce2d39f5d6d..8b74b76a3ca7 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -739,9 +739,8 @@ void DbGridControl::NavigationBar::SetState(DbGridControlNavigationBarState nWhi
             // add the number of selected rows, if applicable
             if (pParent->GetSelectRowCount())
             {
-                OUString aExtendedInfo = aText +
-                    " (";
-                aExtendedInfo += m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()) + ")";
+                OUString aExtendedInfo = aText + " (" +
+                    m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()) + ")";
                 pWnd->SetText(aExtendedInfo);
             }
             else
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index c39630ea3dd4..a409731f18c0 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -814,8 +814,8 @@ namespace svxform
                 m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
                 // Method
                 _rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
-                sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD );
-                sEntry +=  m_aMethodString.toUI( sTemp );
+                sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ) +
+                    m_aMethodString.toUI( sTemp );
                 m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
                 // Ref
                 _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
@@ -827,8 +827,8 @@ namespace svxform
                 m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
                 // Replace
                 _rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
-                sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE );
-                sEntry += m_aReplaceString.toUI( sTemp );
+                sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ) +
+                    m_aReplaceString.toUI( sTemp );
                 m_pItemList->InsertEntry( sEntry, aImage, aImage, pEntry );
             }
             catch ( Exception const & )
@@ -893,13 +893,13 @@ namespace svxform
                 pChild = m_pItemList->GetEntry( pEntry, nPos++ );
                 m_pItemList->SetEntryText( pChild, sEntry );
                 _rEntry->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
-                sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD );
-                sEntry += m_aMethodString.toUI( sTemp );
+                sEntry = SvxResId( RID_STR_DATANAV_SUBM_METHOD ) +
+                    m_aMethodString.toUI( sTemp );
                 pChild = m_pItemList->GetEntry( pEntry, nPos++ );
                 m_pItemList->SetEntryText( pChild, sEntry );
                 _rEntry->getPropertyValue( PN_SUBMISSION_REPLACE ) >>= sTemp;
-                sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE );
-                sEntry += m_aReplaceString.toUI( sTemp );
+                sEntry = SvxResId( RID_STR_DATANAV_SUBM_REPLACE ) +
+                    m_aReplaceString.toUI( sTemp );
                 pChild = m_pItemList->GetEntry( pEntry, nPos++ );
                 m_pItemList->SetEntryText( pChild, sEntry );
             }
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 3dec43d293f9..61f9c7468f54 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -429,8 +429,8 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
                 sal_Int16 nClassID = FormComponentType::CONTROL;
                 xSingleSelection->getPropertyValue( FM_PROP_CLASSID ) >>= nClassID;
 
-                sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL);
-                sTitle += GetUIHeadlineName(nClassID, makeAny(xSingleSelection));
+                sTitle = SvxResId(RID_STR_PROPERTIES_CONTROL) +
+                    GetUIHeadlineName(nClassID, makeAny(xSingleSelection));
             }
             else if ( Reference< XForm >( xSingleSelection, UNO_QUERY ).is() )
                 sTitle = SvxResId(RID_STR_PROPERTIES_FORM);
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index ebf593635f49..0a1aa102d718 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3096,10 +3096,10 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
                         // do we already have the control ?
                         if (aRow.find(rFieldInfo.xText) != aRow.end())
                         {
-                            OUString aCompText = aRow[rFieldInfo.xText] + " ";
                             OString aVal = m_pParser->getContext().getIntlKeywordAscii(IParseContext::InternationalKeyCode::And);
-                            aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US) + " ";
-                            aCompText += ::comphelper::getString(rRefValue.Value);
+                            OUString aCompText = aRow[rFieldInfo.xText] + " "  +
+                                OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US) + " " +
+                                ::comphelper::getString(rRefValue.Value);
                             aRow[rFieldInfo.xText] = aCompText;
                         }
                         else
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 1e0c63c06a24..c79a778459a2 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -407,8 +407,8 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
         pDev->DrawImage( aPnt, pImpl->aPosImage );
         aPnt.AdjustX(pImpl->aPosImage.GetSizePixel().Width() );
         aPnt.AdjustX(PAINT_OFFSET );
-        OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / ";
-        aStr += GetMetricStr_Impl( pImpl->aPos.Y());
+        OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / " +
+            GetMetricStr_Impl( pImpl->aPos.Y());
         tools::Rectangle aRect(aPnt, Point(nSizePosX, rRect.Bottom()));
         pDev->DrawRect(aRect);
         vcl::Region aOrigRegion(pDev->GetClipRegion());
@@ -425,8 +425,8 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
             aPnt.AdjustX(pImpl->aSizeImage.GetSizePixel().Width() );
             Point aDrwPnt = aPnt;
             aPnt.AdjustX(PAINT_OFFSET );
-            aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x ";
-            aStr += GetMetricStr_Impl( pImpl->aSize.Height() );
+            aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x " +
+                GetMetricStr_Impl( pImpl->aSize.Height() );
             aRect = tools::Rectangle(aDrwPnt, rRect.BottomRight());
             pDev->DrawRect(aRect);
             aOrigRegion = pDev->GetClipRegion();
@@ -463,14 +463,14 @@ void SvxPosSizeStatusBarControl::ImplUpdateItemText()
     int nCharsWidth = -1;
     if ( pImpl->bPos || pImpl->bSize )
     {
-        aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / ";
-        aText += GetMetricStr_Impl( pImpl->aPos.Y());
+        aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / " +
+            GetMetricStr_Impl( pImpl->aPos.Y());
         // widest X/Y string looks like "-999,99"
         nCharsWidth = 1 + 6 + 3 + 6; // icon + x + slash + y
         if ( pImpl->bSize )
         {
-            aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x ";
-            aText += GetMetricStr_Impl( pImpl->aSize.Height() );
+            aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x " +
+                GetMetricStr_Impl( pImpl->aSize.Height() );
             nCharsWidth += 1 + 1 + 4 + 3 + 4; // icon + space + w + x + h
         }
     }
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 26da3cef6f65..a19219d6f7cb 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -497,11 +497,11 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
         pEditControl->SetSelection(Selection(SELECTION_MIN,SELECTION_MAX));
         vcl::Window* pParent=GetParent();
         aWNameMemorized=pParent->GetText();
-        OUString aNewName = aWNameMemorized + " ";
-        aNewName += pEntry->GetItemTypeStr();
+        OUString aNewName = aWNameMemorized + " " +
+            pEntry->GetItemTypeStr();
         if (pEntry->bCanNum) {
-            aNewName += ": " + OUString::number(pEntry->nMin);
-            aNewName += ".." + OUString::number(pEntry->nMax);
+            aNewName += ": " + OUString::number(pEntry->nMin) +
+                ".." + OUString::number(pEntry->nMax);
         }
         aNewName += " - Type 'del' to reset to default.";
         pParent->SetText(aNewName);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 56a1ef2b91a6..332ef71b1bb9 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -978,8 +978,8 @@ void SdrMarkView::SetMarkHandles(SfxViewShell* pOtherShell)
                         }
                     }
                 }
-                sSelectionText = aSelection.toString();
-                sSelectionText += OStringLiteral(", ") + OString::number(nRotAngle);
+                sSelectionText = aSelection.toString() +
+                    ", " + OString::number(nRotAngle);
                 if (!aExtraInfo.isEmpty())
                 {
                     sSelectionText += ", " + aExtraInfo.makeStringAndClear();
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 92b7fdb3bdd2..dc69da0ee4ec 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -129,12 +129,10 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
         // calculate correct file name
         if( !( nFlags & XOutFlags::DontExpandFilename ) )
         {
-            OUString aName( aURL.getBase() + "_" );
-            aName += aURL.getExtension() + "_";
             OUString aStr( OUString::number( rGraphic.GetChecksum(), 16 ) );
             if ( aStr[0] == '-' )
                 aStr = "m" + aStr.copy(1);
-            aName += aStr;
+            OUString aName = aURL.getBase() + "_" + aURL.getExtension() + "_" + aStr;
             aURL.setBase( aName );
         }