Fix StringAdd::isCompileTimeConstant

...to find StringLiteral on the RHS of +=.  Which revealed that the
VisitCompoundStmt/checkForCompoundAssign logic needed to be fixed, too, so that

s += side_effect();
s += "literal";
s += side_effect();

only gets combined to

s += side_effect() + "literal";
s += side_effect();

and not all the way to

s += side_effect() + "literal" + side_effect();

Change-Id: I432e3458b933a7d0ad6141c747b675cc8b0f0ba4
Reviewed-on: https://gerrit.libreoffice.org/81804
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 19 insertions, 40 deletions

diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 67681e491ff4..1f819f0974d1 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -44,8 +44,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN
     INetURLObject aURLObj;
     aURLObj.SetSmartProtocol( INetProtocol::File );
     aURLObj.SetSmartURL( rName, INetURLObject::EncodeMechanism::All );
-    OUString aTmp( aURLObj.GetBase() );
-    aTmp += " ";
+    OUString aTmp( aURLObj.GetBase() + " " );
 
     if ( bNeg )
     {
@@ -56,9 +55,7 @@ OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool bN
         aTmp += SvxResId(RID_SVXSTR_LANGUAGE_ALL);
     else
     {
-        aTmp += "[";
-        aTmp += SvtLanguageTable::GetLanguageString( nLang );
-        aTmp += "]";
+        aTmp += "[" + SvtLanguageTable::GetLanguageString( nLang ) + "]";
     }
 
     return aTmp;
@@ -340,14 +337,12 @@ weld::ComboBoxEntry SvxLanguageBox::BuildEntry(const LanguageType nLangType, sal
     if (nRealLang == LANGUAGE_SYSTEM)
     {
         nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang, nType);
-        aStrEntry += " - ";
-        aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang );
+        aStrEntry += " - " + SvtLanguageTable::GetLanguageString( nRealLang );
     }
     else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG)
     {
         nRealLang = MsLangId::getSystemLanguage();
-        aStrEntry += " - ";
-        aStrEntry += SvtLanguageTable::GetLanguageString( nRealLang );
+        aStrEntry += " - " + SvtLanguageTable::GetLanguageString( nRealLang );
     }
 
     if (m_bWithCheckmark)
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 8ffe69bc6f48..1ce2d39f5d6d 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -741,8 +741,7 @@ void DbGridControl::NavigationBar::SetState(DbGridControlNavigationBarState nWhi
             {
                 OUString aExtendedInfo = aText +
                     " (";
-                aExtendedInfo += m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount());
-                aExtendedInfo += ")";
+                aExtendedInfo += m_aAbsolute->CreateFieldText(pParent->GetSelectRowCount()) + ")";
                 pWnd->SetText(aExtendedInfo);
             }
             else
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index e460a025de90..ebf593635f49 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -3096,11 +3096,9 @@ 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];
-                            aCompText += " ";
+                            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 += " ";
+                            aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US) + " ";
                             aCompText += ::comphelper::getString(rRefValue.Value);
                             aRow[rFieldInfo.xText] = aCompText;
                         }
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 45775316bf40..d67df26a067f 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -231,8 +231,7 @@ namespace sdr
 
             if (aDraftText.isEmpty())
             {
-                aDraftText = GetGrafObject().GetName();
-                aDraftText += " ...";
+                aDraftText = GetGrafObject().GetName() + " ...";
             }
 
             if (!aDraftText.isEmpty())
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 084d251c91dd..1e0c63c06a24 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -407,8 +407,7 @@ 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 += " / ";
+        OUString aStr = GetMetricStr_Impl( pImpl->aPos.X()) + " / ";
         aStr += GetMetricStr_Impl( pImpl->aPos.Y());
         tools::Rectangle aRect(aPnt, Point(nSizePosX, rRect.Bottom()));
         pDev->DrawRect(aRect);
@@ -426,8 +425,7 @@ 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() );
-            aStr += " x ";
+            aStr = GetMetricStr_Impl( pImpl->aSize.Width() ) + " x ";
             aStr += GetMetricStr_Impl( pImpl->aSize.Height() );
             aRect = tools::Rectangle(aDrwPnt, rRect.BottomRight());
             pDev->DrawRect(aRect);
@@ -465,16 +463,13 @@ void SvxPosSizeStatusBarControl::ImplUpdateItemText()
     int nCharsWidth = -1;
     if ( pImpl->bPos || pImpl->bSize )
     {
-        aText = GetMetricStr_Impl( pImpl->aPos.X());
-        aText += " / ";
+        aText = GetMetricStr_Impl( pImpl->aPos.X()) + " / ";
         aText += 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 += " ";
-            aText += GetMetricStr_Impl( pImpl->aSize.Width() );
-            aText += " x ";
+            aText += " " + GetMetricStr_Impl( pImpl->aSize.Width() ) + " x ";
             aText += 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 532df4f7a8b2..26da3cef6f65 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -500,10 +500,8 @@ bool SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos)
         OUString aNewName = aWNameMemorized + " ";
         aNewName += pEntry->GetItemTypeStr();
         if (pEntry->bCanNum) {
-            aNewName += ": ";
-            aNewName += OUString::number(pEntry->nMin);
-            aNewName += "..";
-            aNewName += OUString::number(pEntry->nMax);
+            aNewName += ": " + OUString::number(pEntry->nMin);
+            aNewName += ".." + OUString::number(pEntry->nMax);
         }
         aNewName += " - Type 'del' to reset to default.";
         pParent->SetText(aNewName);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index ec9514698168..76222cd30158 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1260,8 +1260,7 @@ OUString SdrView::GetStatusText()
         aStr = aStr.replaceFirst("%3", OUString::number(nCol + 1));
 
 #ifdef DBG_UTIL
-        aStr +=  ", Level " ;
-        aStr += OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
+        aStr +=  ", Level " + OUString::number( pTextEditOutliner->GetDepth( aSel.nEndPara ) );
 #endif
     }
 
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 7942eee58af5..dee443327e08 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -561,8 +561,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
 
     if( bUndo )
     {
-        aUndoStr = rView.GetDescriptionOfMarkedObjects();
-        aUndoStr += " ";
+        aUndoStr = rView.GetDescriptionOfMarkedObjects() + " ";
     }
 
     const SfxItemSet*   pArgs = rReq.GetArgs();
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index ce8142d560be..2c2603fb4c8d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3812,8 +3812,7 @@ void SvxCurrencyToolBoxControl::GetCurrencySymbols( std::vector<OUString>& rList
 
     sal_uInt16 nStart = 1;
 
-    OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol() ) );
-    aString += " ";
+    OUString aString( ApplyLreOrRleEmbedding( rCurrencyTable[0].GetSymbol() ) + " " );
     aString += ApplyLreOrRleEmbedding( SvtLanguageTable::GetLanguageString(
                                        rCurrencyTable[0].GetLanguage() ) );
 
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 57be5a899702..92b7fdb3bdd2 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -129,10 +129,8 @@ ErrCode XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileName,
         // calculate correct file name
         if( !( nFlags & XOutFlags::DontExpandFilename ) )
         {
-            OUString aName( aURL.getBase() );
-            aName += "_";
-            aName += aURL.getExtension();
-            aName += "_";
+            OUString aName( aURL.getBase() + "_" );
+            aName += aURL.getExtension() + "_";
             OUString aStr( OUString::number( rGraphic.GetChecksum(), 16 ) );
             if ( aStr[0] == '-' )
                 aStr = "m" + aStr.copy(1);