summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:32:22 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-05-06 16:51:45 +0200
commite2e2cc61144cb22227eebfadff0ea24b51ccfbd0 (patch)
tree8063275cabcdf32e30c37451a32d96db5929561a /cppu
parentd01768c31a0658c8a74e0dd3a95b2d781639d18e (diff)
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/threadpool/thread.cxx3
-rw-r--r--cppu/source/uno/cascade_mapping.cxx2
-rw-r--r--cppu/source/uno/lbenv.cxx2
-rw-r--r--cppu/source/uno/lbmap.cxx4
4 files changed, 5 insertions, 6 deletions
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index f0dc4d6b67eb..85076b00157b 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -55,9 +55,8 @@ namespace cppu_threadpool {
{
throw css::lang::DisposedException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"cppu_threadpool::ORequestThread created after"
- " cppu_threadpool::ThreadAdmin has been disposed")),
+ " cppu_threadpool::ThreadAdmin has been disposed"),
css::uno::Reference< css::uno::XInterface >());
}
m_lst.push_back( p );
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 5e53ea8d476c..bc954c67ba73 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -224,7 +224,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
if (pAddPurpose && pAddPurpose->length)
return;
- rtl::OUString uno_envType(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO));
+ rtl::OUString uno_envType(UNO_LB_UNO);
rtl::OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName);
rtl::OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 23373182b84e..27a1027c9a6a 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1075,7 +1075,7 @@ static bool loadEnv(OUString const & cLibStem,
if (!hMod)
return false;
- OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT));
+ OUString aSymbolName(UNO_INIT_ENVIRONMENT);
uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc)
::osl_getFunctionSymbol( hMod, aSymbolName.pData );
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index f699cee57964..65d47760d6ee 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -430,7 +430,7 @@ static Mapping loadExternalMapping(
if (hModule)
{
- OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) );
+ OUString aSymbolName( UNO_EXT_GETMAPPING );
uno_ext_getMappingFunc fpGetMapFunc =
(uno_ext_getMappingFunc)::osl_getFunctionSymbol(
hModule, aSymbolName.pData );
@@ -507,7 +507,7 @@ static Mapping getMediateMapping(
// backwards: from dest to source of mapping chain
// connect to uno
- OUString aUnoEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) );
+ OUString aUnoEnvTypeName( UNO_LB_UNO );
if (rTo.getTypeName() == aUnoEnvTypeName) // to is uno
{
aUno = rTo;