diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-30 15:09:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-01 09:22:23 +0200 |
| commit | 727200b81da0de810dfe623bf52575540f40adbe (patch) | |
| tree | 3ba4786631faffd79bb20ae14a7b986a842aeda8 /cppu | |
| parent | 2113f3e7ee0ca5c07f224a54b627777b3a7b5fb0 (diff) | |
loplugin:stringadd in basctl..cui
Change-Id: I2fdeb7eb3ead3512ad6d3fe793305038ab3aa7ae
Reviewed-on: https://gerrit.libreoffice.org/79886
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/EnvStack.cxx | 7 | ||||
| -rw-r--r-- | cppu/source/uno/cascade_mapping.cxx | 14 | ||||
| -rw-r--r-- | cppu/source/uno/lbenv.cxx | 6 |
3 files changed, 9 insertions, 18 deletions
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx index 9907011987f9..5757023cbb88 100644 --- a/cppu/source/uno/EnvStack.cxx +++ b/cppu/source/uno/EnvStack.cxx @@ -119,8 +119,7 @@ extern "C" void SAL_CALL uno_getCurrentEnvironment(uno_Environment ** ppEnv, rtl if (pTypeName && rtl_uString_getLength(pTypeName)) { - OUString envDcp(pTypeName); - envDcp += currPurpose; + OUString envDcp = OUString(pTypeName) + currPurpose; uno_getEnvironment(ppEnv, envDcp.pData, nullptr); } @@ -202,9 +201,7 @@ static int s_getNextEnv(uno_Environment ** ppEnv, uno_Environment * pCurrEnv, un if (!nextPurpose.isEmpty()) { - OUString next_envDcp(UNO_LB_UNO); - next_envDcp += nextPurpose; - + OUString next_envDcp = UNO_LB_UNO + nextPurpose; uno_getEnvironment(ppEnv, next_envDcp.pData, nullptr); } else diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx index 7d44296ea062..13df4d8814e7 100644 --- a/cppu/source/uno/cascade_mapping.cxx +++ b/cppu/source/uno/cascade_mapping.cxx @@ -231,8 +231,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, { OUString purpose = getPrefix(from_envPurpose, to_envPurpose); - OUString uno_envDcp = uno_envType; - uno_envDcp += purpose; + OUString uno_envDcp = uno_envType + purpose; // direct mapping possible? // uno:bla-->uno:bla:blubb @@ -268,17 +267,13 @@ void getCascadeMapping(uno_Mapping ** ppMapping, else if (from_envType != uno_envType && to_envType == uno_envType) // <ANY> -> UNO ? // mediate via uno:purpose(fromEnv) { - OUString envDcp = uno_envType; - - envDcp += from_envPurpose; + OUString envDcp = uno_envType + from_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, nullptr); } else if (from_envType == uno_envType && to_envType != uno_envType) // UNO -> <ANY>? // mediate via uno(context) { - OUString envDcp = uno_envType; - - envDcp += to_envPurpose; + OUString envDcp = uno_envType + to_envPurpose; uno_getEnvironment(&pInterm, envDcp.pData, nullptr); } else // everything else @@ -286,8 +281,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping, { OUString purpose = getPrefix(from_envPurpose, to_envPurpose); - OUString uno_envDcp = uno_envType; - uno_envDcp += purpose; + OUString uno_envDcp = uno_envType + purpose; uno_getEnvironment(&pInterm, uno_envDcp.pData, nullptr); } diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 55b513a9d5de..71a8e8cb484d 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -931,9 +931,9 @@ void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv ) OSL_ENSURE( ppEnv, "### null ptr!" ); uno_Environment * pEnv = *ppEnv; - OUString aKey( - OUString::number( reinterpret_cast< sal_IntPtr >(pEnv->pContext) ) ); - aKey += pEnv->pTypeName; + OUString aKey = + OUString::number( reinterpret_cast< sal_IntPtr >(pEnv->pContext) ) + + OUString(pEnv->pTypeName); // try to find registered environment OUString2EnvironmentMap::const_iterator const iFind( |