summaryrefslogtreecommitdiff
path: root/cppuhelper
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 11:39:07 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 10:48:30 +0000
commit39d45390f4fab1e9e85f211d74ed2c08fda5b652 (patch)
treeac4b224a66a18429cd4722a61ee3d401f8e9951c /cppuhelper
parent5c908d0431ee975c1ee7aa245af83b9eb7f95da6 (diff)
removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Reviewed-on: https://gerrit.libreoffice.org/2835 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'cppuhelper')
-rw-r--r--cppuhelper/source/tdmgr.cxx30
-rw-r--r--cppuhelper/test/cfg_test.cxx4
-rw-r--r--cppuhelper/test/testcmp/TestComponent.cxx2
3 files changed, 18 insertions, 18 deletions
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index ef922dca6733..e230c1514689 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -532,91 +532,91 @@ static typelib_TypeDescription * createCTD(
// built in types
case TypeClass_VOID:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("void") );
+ OUString aTypeName("void");
typelib_typedescription_new( &pRet, typelib_TypeClass_VOID, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_CHAR:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("char") );
+ OUString aTypeName("char");
typelib_typedescription_new( &pRet, typelib_TypeClass_CHAR, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_BOOLEAN:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("boolean") );
+ OUString aTypeName("boolean");
typelib_typedescription_new( &pRet, typelib_TypeClass_BOOLEAN, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_BYTE:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("byte") );
+ OUString aTypeName("byte");
typelib_typedescription_new( &pRet, typelib_TypeClass_BYTE, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_SHORT:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("short") );
+ OUString aTypeName("short");
typelib_typedescription_new( &pRet, typelib_TypeClass_SHORT, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_UNSIGNED_SHORT:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned short") );
+ OUString aTypeName("unsigned short");
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_SHORT, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_LONG:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("long") );
+ OUString aTypeName("long");
typelib_typedescription_new( &pRet, typelib_TypeClass_LONG, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_UNSIGNED_LONG:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned long") );
+ OUString aTypeName("unsigned long");
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_LONG, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_HYPER:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("hyper") );
+ OUString aTypeName("hyper");
typelib_typedescription_new( &pRet, typelib_TypeClass_HYPER, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_UNSIGNED_HYPER:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned hyper") );
+ OUString aTypeName("unsigned hyper");
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_HYPER, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_FLOAT:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("float") );
+ OUString aTypeName("float");
typelib_typedescription_new( &pRet, typelib_TypeClass_FLOAT, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_DOUBLE:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("double") );
+ OUString aTypeName("double");
typelib_typedescription_new( &pRet, typelib_TypeClass_DOUBLE, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_STRING:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("string") );
+ OUString aTypeName("string");
typelib_typedescription_new( &pRet, typelib_TypeClass_STRING, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_TYPE:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("type") );
+ OUString aTypeName("type");
typelib_typedescription_new( &pRet, typelib_TypeClass_TYPE, aTypeName.pData, 0, 0, 0 );
break;
}
case TypeClass_ANY:
{
- OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("any") );
+ OUString aTypeName("any");
typelib_typedescription_new( &pRet, typelib_TypeClass_ANY, aTypeName.pData, 0, 0, 0 );
break;
}
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index 4acc23c2e741..dbbc3e0b05b3 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -53,7 +53,7 @@ namespace cfg_test
//--------------------------------------------------------------------------------------------------
static Sequence< OUString > impl0_getSupportedServiceNames()
{
- OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent0") );
+ OUString str("com.sun.star.bootstrap.TestComponent0");
return Sequence< OUString >( &str, 1 );
}
//--------------------------------------------------------------------------------------------------
@@ -64,7 +64,7 @@ static OUString impl0_getImplementationName()
//--------------------------------------------------------------------------------------------------
static Sequence< OUString > impl1_getSupportedServiceNames()
{
- OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent1") );
+ OUString str("com.sun.star.bootstrap.TestComponent1");
return Sequence< OUString >( &str, 1 );
}
//--------------------------------------------------------------------------------------------------
diff --git a/cppuhelper/test/testcmp/TestComponent.cxx b/cppuhelper/test/testcmp/TestComponent.cxx
index a5cd71daea35..999417a57a24 100644
--- a/cppuhelper/test/testcmp/TestComponent.cxx
+++ b/cppuhelper/test/testcmp/TestComponent.cxx
@@ -179,7 +179,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
rtl::OUString uTmp(pImplName, rtl_str_getLength(pImplName), RTL_TEXTENCODING_ASCII_US);
rtl::OUString uImplName(cppu::EnvDcp::getTypeName(uTmp));
- rtl::OUString cmpName(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent"));
+ rtl::OUString cmpName("impl.test.TestComponent");
if (uImplName.equals(cmpName))
{