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>

3 files changed, 14 insertions, 28 deletions

diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index a32e8d69607a..ea5e23d38f9b 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -685,8 +685,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                 try
                 {
                     OUString aOldValuesKey
-                        = makeHierarchalNameSegment( rOldKey );
-                    aOldValuesKey += "/Values";
+                        = makeHierarchalNameSegment( rOldKey ) + "/Values";
 
                     Reference< XNameAccess > xOldNameAccess;
                     xRootHierNameAccess->getByHierarchicalName(
@@ -705,8 +704,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
                     if ( aElems.hasElements() )
                     {
                         OUString aNewValuesKey
-                            = makeHierarchalNameSegment( rNewKey );
-                        aNewValuesKey += "/Values";
+                            = makeHierarchalNameSegment( rNewKey ) + "/Values";
 
                         Reference< XSingleServiceFactory > xNewFac;
                         xRootHierNameAccess->getByHierarchicalName(
@@ -1189,8 +1187,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty
                 m_pImpl->m_pCreator->getRootConfigReadAccess(), UNO_QUERY );
     if ( xRootHierNameAccess.is() )
     {
-        OUString aFullPropName( getFullKey() );
-        aFullPropName += "/";
+        OUString aFullPropName( getFullKey() + "/" );
         aFullPropName += makeHierarchalNameSegment( aPropertyName );
 
         // Does property exist?
@@ -1285,10 +1282,8 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
                 m_pImpl->m_pCreator->getRootConfigReadAccess(), UNO_QUERY );
     if ( xNameAccess.is() )
     {
-        OUString aFullPropName( getFullKey() );
-        aFullPropName += "/";
-        aFullPropName += makeHierarchalNameSegment( PropertyName );
-        aFullPropName += "/Value";
+        OUString aFullPropName( getFullKey() + "/" );
+        aFullPropName += makeHierarchalNameSegment( PropertyName ) + "/Value";
         try
         {
             return xNameAccess->getByHierarchicalName( aFullPropName );
@@ -1863,8 +1858,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
     {
         std::vector< PropertyChangeEvent > aEvents;
 
-        OUString aFullPropNamePrefix( getFullKey() );
-        aFullPropNamePrefix += "/";
+        OUString aFullPropNamePrefix( getFullKey() + "/" );
 
         // Iterate over given property value sequence.
         for ( const PropertyValue& rNewValue : aProps )
@@ -2210,8 +2204,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
             UNO_QUERY );
     if ( xRootHierNameAccess.is() )
     {
-        OUString aFullPropName( m_pOwner->getFullKey() );
-        aFullPropName += "/";
+        OUString aFullPropName( m_pOwner->getFullKey() + "/" );
         aFullPropName += makeHierarchalNameSegment( aName );
 
         // Does property exist?
@@ -2290,8 +2283,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
             UNO_QUERY );
     if ( xRootHierNameAccess.is() )
     {
-        OUString aFullPropName( m_pOwner->getFullKey() );
-        aFullPropName += "/";
+        OUString aFullPropName( m_pOwner->getFullKey() + "/" );
         aFullPropName += makeHierarchalNameSegment( Name );
 
         return xRootHierNameAccess->hasByHierarchicalName( aFullPropName );
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 5a15896cfca5..707f0e31a1f7 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -698,8 +698,7 @@ HierarchyContent::makeNewIdentifier( const OUString& rTitle )
 
     // Assemble new content identifier...
     HierarchyUri aUri( m_xIdentifier->getContentIdentifier() );
-    OUString aNewURL = aUri.getParentUri();
-    aNewURL += "/";
+    OUString aNewURL = aUri.getParentUri() + "/";
     aNewURL += ::ucb_impl::urihelper::encodeSegment( rTitle );
 
     return uno::Reference< ucb::XContentIdentifier >(
@@ -1347,8 +1346,7 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve,
 
                 do
                 {
-                    OUString aNewId = xId->getContentIdentifier();
-                    aNewId += "_";
+                    OUString aNewId = xId->getContentIdentifier() + "_";
                     aNewId += OUString::number( ++nTry );
                     xId = new ::ucbhelper::ContentIdentifier( aNewId );
                 }
diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx
index 8b645a0b70fb..08e5129b1cfb 100644
--- a/ucb/source/ucp/package/pkgcontent.cxx
+++ b/ucb/source/ucp/package/pkgcontent.cxx
@@ -647,8 +647,7 @@ Content::createNewContent( const ucb::ContentInfo& Info )
                 getContentType( m_aUri.getScheme(), false ) ) )
             return uno::Reference< ucb::XContent >();
 
-        OUString aURL = m_aUri.getUri();
-        aURL += "/";
+        OUString aURL = m_aUri.getUri() + "/";
 
         if ( Info.Type.equalsIgnoreAsciiCase(
                 getContentType( m_aUri.getScheme(), true ) ) )
@@ -1256,8 +1255,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         uno::Reference< ucb::XContentIdentifier > xOldId = m_xIdentifier;
 
         // Assemble new content identifier...
-        OUString aNewURL = m_aUri.getParentUri();
-        aNewURL += "/";
+        OUString aNewURL = m_aUri.getParentUri() + "/";
         aNewURL += ::ucb_impl::urihelper::encodeSegment( aNewTitle );
         uno::Reference< ucb::XContentIdentifier > xNewId
             = new ::ucbhelper::ContentIdentifier( aNewURL );
@@ -1536,8 +1534,7 @@ void Content::insert(
 
                 do
                 {
-                    OUString aNew = aNewUri.getUri();
-                    aNew += "_";
+                    OUString aNew = aNewUri.getUri() + "_";
                     aNew += OUString::number( ++nTry );
                     aNewUri.setUri( aNew );
                 }
@@ -1692,8 +1689,7 @@ void Content::transfer(
     }
 
     // Is source not a parent of me / not me?
-    OUString aId = m_aUri.getParentUri();
-    aId += "/";
+    OUString aId = m_aUri.getParentUri() + "/";
 
     if ( rInfo.SourceURL.getLength() <= aId.getLength() )
     {