loplugin:stringadd in c*

after my patch to merge the bufferadd loplugin into stringadd

Change-Id: I66f4ce2fd87c1e12eefb14406e0e17212f68ceff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149497
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 29 insertions, 34 deletions

diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 6847e2486c58..f9d6633b2bed 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -697,8 +697,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
     {
         writeLine( stream, "###################################"
                    "###########################################", pFilter );
-        buf.append( "environment: " );
-        buf.append( pEnv->pTypeName );
+        buf.append( OUString::Concat("environment: ") + OUString::unacquired(&pEnv->pTypeName) );
         writeLine( stream, buf, pFilter );
         buf.setLength(0);
         writeLine( stream, "NO INTERFACE INFORMATION AVAILABLE!", pFilter );
@@ -707,8 +706,7 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
 
     writeLine( stream, "########################################"
                "######################################", pFilter );
-    buf.append( "environment dump: " );
-    buf.append( pEnv->pTypeName );
+    buf.append( OUString::Concat("environment dump: ") + OUString::unacquired(&pEnv->pTypeName) );
     writeLine( stream, buf, pFilter );
     buf.setLength(0);
 
@@ -724,11 +722,11 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
         buf.append( "+ " );
         if (pOEntry->mixedObject)
             buf.append( "mixed " );
-        buf.append( "object entry: nRef=" );
-        buf.append( pOEntry->nRef );
-        buf.append( "; oid=\"" );
-        buf.append( pOEntry->oid );
-        buf.append( '\"' );
+        buf.append( "object entry: nRef="
+                + OUString::number(pOEntry->nRef)
+                + "; oid=\""
+                + pOEntry->oid
+                + "\"" );
         writeLine( stream, buf, pFilter );
         buf.setLength(0);
 
@@ -737,21 +735,19 @@ extern "C" void SAL_CALL uno_dumpEnvironment(
         {
             const InterfaceEntry & rIEntry = pOEntry->aInterfaces[nPos];
 
-            buf.append( "  - " );
-            buf.append( rIEntry.pTypeDescr->aBase.pTypeName );
+            buf.append( OUString::Concat("  - ")
+                + OUString::unacquired(&rIEntry.pTypeDescr->aBase.pTypeName) );
             if (rIEntry.fpFreeProxy)
             {
-                buf.append( "; proxy free=0x" );
-                buf.append(
-                    reinterpret_cast< sal_IntPtr >(rIEntry.fpFreeProxy), 16 );
+                buf.append( "; proxy free=0x"
+                    + OUString::number( reinterpret_cast< sal_IntPtr >(rIEntry.fpFreeProxy), 16 ) );
             }
             else
             {
                 buf.append( "; original" );
             }
-            buf.append( "; ptr=0x" );
-            buf.append(
-                reinterpret_cast< sal_IntPtr >(rIEntry.pInterface), 16 );
+            buf.append( "; ptr=0x"
+                + OUString::number(reinterpret_cast< sal_IntPtr >(rIEntry.pInterface), 16 ) );
 
             if (pOEntry->find( rIEntry.pInterface, nPos + 1 ) < 0)
             {
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index b056193de7b3..cbf613784ee4 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -285,18 +285,17 @@ uno_Mediate_Mapping::uno_Mediate_Mapping(
 static OUString getMappingName(
     const Environment & rFrom, const Environment & rTo, std::u16string_view rAddPurpose )
 {
-    OUStringBuffer aKey( 64 );
-    aKey.append( rAddPurpose );
-    aKey.append( ';' );
-    aKey.append( rFrom.getTypeName() );
-    aKey.append( '[' );
-    aKey.append( reinterpret_cast< sal_IntPtr >(rFrom.get()), 16 );
-    aKey.append( "];" );
-    aKey.append( rTo.getTypeName() );
-    aKey.append( '[' );
-    aKey.append( reinterpret_cast< sal_IntPtr >(rTo.get()), 16 );
-    aKey.append( ']' );
-    return aKey.makeStringAndClear();
+    return
+        OUString::Concat(rAddPurpose)
+        + ";"
+        + rFrom.getTypeName()
+        + "["
+        + OUString::number( reinterpret_cast< sal_IntPtr >(rFrom.get()), 16 )
+        + "];"
+        + rTo.getTypeName()
+        + "["
+        + OUString::number( reinterpret_cast< sal_IntPtr >(rTo.get()), 16 )
+        + "]";
 }
 
 static OUString getBridgeName(
@@ -305,12 +304,12 @@ static OUString getBridgeName(
     OUStringBuffer aBridgeName( 16 );
     if (!rAddPurpose.empty())
     {
-        aBridgeName.append( rAddPurpose );
-        aBridgeName.append( '_' );
+        aBridgeName.append( OUString::Concat(rAddPurpose) + "_" );
     }
-    aBridgeName.append( EnvDcp::getTypeName(rFrom.getTypeName()) );
-    aBridgeName.append( '_' );
-    aBridgeName.append( EnvDcp::getTypeName(rTo.getTypeName()) );
+    aBridgeName.append(
+        EnvDcp::getTypeName(rFrom.getTypeName())
+        + "_"
+        + EnvDcp::getTypeName(rTo.getTypeName()) );
     return aBridgeName.makeStringAndClear();
 }