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>

2 files changed, 2 insertions, 4 deletions

diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index a14d6367d3ca..7c51f7c7a1b4 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -817,8 +817,7 @@ namespace frm
                     aStatement += quoteName(aQuote,aFieldName);
                     if (!aBoundFieldName.isEmpty())
                     {
-                        aStatement += ", ";
-                        aStatement += quoteName(aQuote, aBoundFieldName);
+                        aStatement += ", " + quoteName(aQuote, aBoundFieldName);
                     }
                     aStatement += " FROM ";
 
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index a512c54a0793..f72cc3193dfd 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -57,8 +57,7 @@ namespace frm
 
         OUString getLabelString(const char* pResId)
         {
-            OUString sLabel( " " + FRM_RES_STRING(pResId) );
-            sLabel += " ";
+            OUString sLabel( " " + FRM_RES_STRING(pResId) + " " );
             return sLabel;
         }