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>

1 files changed, 2 insertions, 6 deletions

diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 1f7db49ccec1..e7b430b20986 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -5203,9 +5203,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
             {
                 if ( rKey[j] == rColorName )
                 {
-                    aPrefix += "[";
-                    aPrefix += rKeywords[j];
-                    aPrefix += "]";
+                    aPrefix += "[" + rKeywords[j] + "]";
                     break;  // for
                 }
             }
@@ -5219,9 +5217,7 @@ OUString SvNumberformat::GetMappedFormatstring( const NfKeywordTable& rKeywords,
                 aNatNum.SetLang( nOriginalLang );
             if ( aNatNum.GetDBNum() > 0 )
             {
-                aPrefix += "[DBNum";
-                aPrefix += OUString::number( aNatNum.GetDBNum() );
-                aPrefix += "]";
+                aPrefix += "[DBNum" + OUString::number( aNatNum.GetDBNum() ) + "]";
                 bDBNumInserted = true;
             }
         }