1 files changed, 35 insertions, 35 deletions

diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 43818eb85025..04e4c28eee4c 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -27,6 +27,7 @@
 #include <mutex>
 #include <set>
 #include <unordered_map>
+#include <utility>
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -125,11 +126,11 @@ struct MappingEntry
 
     MappingEntry(
         uno_Mapping * pMapping_, uno_freeMappingFunc freeMapping_,
-        const OUString & rMappingName_ )
+        OUString aMappingName_ )
         : nRef( 1 )
         , pMapping( pMapping_ )
         , freeMapping( freeMapping_ )
-        , aMappingName( rMappingName_ )
+        , aMappingName(std::move( aMappingName_ ))
         {}
 };
 
@@ -154,7 +155,7 @@ struct MappingsData
     t_OUString2Entry    aName2Entry;
     t_Mapping2Entry     aMapping2Entry;
 
-    Mutex               aCallbacksMutex;
+    std::mutex          aCallbacksMutex;
     std::set< uno_getMappingFunc >
                         aCallbacks;
 
@@ -192,9 +193,9 @@ struct uno_Mediate_Mapping : public uno_Mapping
     OUString    aAddPurpose;
 
     uno_Mediate_Mapping(
-        const Environment & rFrom_, const Environment & rTo_,
-        const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
-        const OUString & rAddPurpose );
+        Environment aFrom_, Environment aTo_,
+        Mapping aFrom2Uno_, Mapping aUno2To_,
+        OUString aAddPurpose );
 };
 
 }
@@ -265,15 +266,15 @@ static void mediate_mapInterface(
 }
 
 uno_Mediate_Mapping::uno_Mediate_Mapping(
-    const Environment & rFrom_, const Environment & rTo_,
-    const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
-    const OUString & rAddPurpose_ )
+    Environment aFrom_, Environment aTo_,
+    Mapping aFrom2Uno_, Mapping aUno2To_,
+    OUString aAddPurpose_ )
     : nRef( 1 )
-    , aFrom( rFrom_ )
-    , aTo( rTo_ )
-    , aFrom2Uno( rFrom2Uno_ )
-    , aUno2To( rUno2To_ )
-    , aAddPurpose( rAddPurpose_ )
+    , aFrom(std::move( aFrom_ ))
+    , aTo(std::move( aTo_ ))
+    , aFrom2Uno(std::move( aFrom2Uno_ ))
+    , aUno2To(std::move( aUno2To_ ))
+    , aAddPurpose(std::move( aAddPurpose_ ))
 {
     uno_Mapping::acquire        = mediate_acquire;
     uno_Mapping::release        = mediate_release;
@@ -284,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(
@@ -304,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();
 }
 
@@ -621,7 +621,7 @@ void SAL_CALL uno_getMapping(
 
         // try callback chain
         {
-            MutexGuard aGuard(rData.aCallbacksMutex);
+            std::unique_lock aGuard(rData.aCallbacksMutex);
             for (const auto& rCallback : rData.aCallbacks)
             {
                 (*rCallback)(ppMapping, pFrom, pTo, aAddPurpose.pData);
@@ -715,7 +715,7 @@ void SAL_CALL uno_revokeMapping(
     ClearableMutexGuard aGuard( rData.aMappingsMutex );
 
     const t_Mapping2Entry::const_iterator iFind( rData.aMapping2Entry.find( pMapping ) );
-    OSL_ASSERT( iFind != rData.aMapping2Entry.end() );
+    assert(iFind != rData.aMapping2Entry.end() && "pMapping must be registered to be removed");
     MappingEntry * pEntry = (*iFind).second;
     if (! --pEntry->nRef)
     {
@@ -735,7 +735,7 @@ void SAL_CALL uno_registerMappingCallback(
 {
     OSL_ENSURE( pCallback, "### null ptr!" );
     MappingsData & rData = getMappingsData();
-    MutexGuard aGuard( rData.aCallbacksMutex );
+    std::unique_lock aGuard( rData.aCallbacksMutex );
     rData.aCallbacks.insert( pCallback );
 }
 
@@ -745,7 +745,7 @@ void SAL_CALL uno_revokeMappingCallback(
 {
     OSL_ENSURE( pCallback, "### null ptr!" );
     MappingsData & rData = getMappingsData();
-    MutexGuard aGuard( rData.aCallbacksMutex );
+    std::unique_lock aGuard( rData.aCallbacksMutex );
     rData.aCallbacks.erase( pCallback );
 }
 } // extern "C"