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>

4 files changed, 8 insertions, 16 deletions

diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 09dcd0cfe85c..10eb16a0c815 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -148,8 +148,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
         const OUString &rReloadURL = i_xDocProps->getAutoloadURL();
         if( !rReloadURL.isEmpty() )
         {
-            sContent += ";URL=";
-            sContent += URIHelper::simpleNormalizedMakeRelative(
+            sContent += ";URL=" + URIHelper::simpleNormalizedMakeRelative(
                           rBaseURL, rReloadURL);
         }
 
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index fec0cd321c8b..d549ab6c0d42 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -157,8 +157,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin
                     OUString aTitle( xRow->getString(1) );
                     bool bFolder = xRow->getBoolean(2);
                     OUString aRow = aTitle + "\t";
-                    aRow += xContentAccess->queryContentIdentifierString();
-                    aRow += "\t";
+                    aRow += xContentAccess->queryContentIdentifierString() + "\t";
                     aRow += bFolder ? OUString("1") : OUString("0");
                     aProperties.push_back( aRow );
                 }
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 184509187e2f..d58bd3986540 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -818,8 +818,7 @@ void SfxDocumentPage::ImplUpdateSignatures()
     else if ( aInfos.getLength() == 1 )
     {
         const security::DocumentSignatureInformation& rInfo = aInfos[ 0 ];
-        s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime );
-        s += ", ";
+        s = utl::GetDateTimeString( rInfo.SignatureDate, rInfo.SignatureTime ) + ", ";
         s += comphelper::xmlsec::GetContentPart(rInfo.Signer->getSubjectName());
     }
     m_xSignedValFt->set_label(s);
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index eea857b6628f..edfbf407961d 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -93,17 +93,12 @@ void SearchDialog::SaveConfig()
     int i = 0, nCount = std::min(m_xSearchEdit->get_count(), static_cast<int>(MAX_SAVE_COUNT));
     for ( ; i < nCount; ++i )
     {
-        sUserData += m_xSearchEdit->get_text(i);
-        sUserData += "\t";
+        sUserData += m_xSearchEdit->get_text(i) + "\t";
     }
-    sUserData = comphelper::string::stripStart(sUserData, '\t');
-    sUserData += ";";
-    sUserData += OUString::number( m_xWholeWordsBox->get_active() ? 1 : 0 );
-    sUserData += ";";
-    sUserData += OUString::number( m_xMatchCaseBox->get_active() ? 1 : 0 );
-    sUserData += ";";
-    sUserData += OUString::number( m_xWrapAroundBox->get_active() ? 1 : 0 );
-    sUserData += ";";
+    sUserData = comphelper::string::stripStart(sUserData, '\t') + ";";
+    sUserData += OUString::number( m_xWholeWordsBox->get_active() ? 1 : 0 ) + ";";
+    sUserData += OUString::number( m_xMatchCaseBox->get_active() ? 1 : 0 ) + ";";
+    sUserData += OUString::number( m_xWrapAroundBox->get_active() ? 1 : 0 ) + ";";
     sUserData += OUString::number( m_xBackwardsBox->get_active() ? 1 : 0 );
 
     Any aUserItem = makeAny( sUserData );