summaryrefslogtreecommitdiff
path: root/testtools
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 /testtools
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 'testtools')
-rw-r--r--testtools/source/bridgetest/bridgetest.cxx14
-rw-r--r--testtools/source/bridgetest/cppobj.cxx6
2 files changed, 10 insertions, 10 deletions
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 0ba8b42ac793..3c2bcda4995c 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -73,7 +73,7 @@ Sequence<T> cloneSequence(const Sequence<T>& val);
//--------------------------------------------------------------------------------------------------
inline static Sequence< OUString > getSupportedServiceNames()
{
- OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+ OUString aName( SERVICENAME );
return Sequence< OUString >( &aName, 1 );
}
@@ -1092,9 +1092,9 @@ inline bool makeSurrogate(
Environment aCppEnv_ano;
OUString aCppEnvTypeName(
- RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+ CPPU_CURRENT_LANGUAGE_BINDING_NAME );
OUString aUnoEnvTypeName(
- RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) );
+ UNO_LB_UNO );
// official:
uno_getEnvironment(
reinterpret_cast< uno_Environment ** >( &aCppEnv_official ),
@@ -1147,9 +1147,9 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
{
if (! rArgs.getLength())
{
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM(
+ throw RuntimeException( OUString(
"no test object specified!\n"
- "usage : ServiceName of test object | -u unourl of test object\n" ) ),
+ "usage : ServiceName of test object | -u unourl of test object\n" ),
Reference< XInterface >() );
}
@@ -1238,7 +1238,7 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
OUString TestBridgeImpl::getImplementationName()
throw (RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) );
+ return OUString( IMPLNAME );
}
//__________________________________________________________________________________________________
sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName )
@@ -1286,7 +1286,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
Reference< XInterface > xFactory(
createSingleComponentFactory(
bridge_test::TestBridgeImpl_create,
- OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ),
+ OUString( IMPLNAME ),
bridge_test::getSupportedServiceNames() ) );
if (xFactory.is())
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 9d6d2517ceed..e9133b2faf46 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -63,7 +63,7 @@ namespace bridge_object
//--------------------------------------------------------------------------------------------------
inline static Sequence< OUString > getSupportedServiceNames()
{
- OUString aName( RTL_CONSTASCII_USTRINGPARAM(SERVICENAME) );
+ OUString aName( SERVICENAME );
return Sequence< OUString >( &aName, 1 );
}
@@ -1148,7 +1148,7 @@ Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker()
OUString Test_Impl::getImplementationName()
throw (RuntimeException)
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) );
+ return OUString( IMPLNAME );
}
//__________________________________________________________________________________________________
sal_Bool Test_Impl::supportsService( const OUString & rServiceName )
@@ -1193,7 +1193,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
{
Reference< XSingleServiceFactory > xFactory( createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
- OUString( RTL_CONSTASCII_USTRINGPARAM(IMPLNAME) ),
+ OUString( IMPLNAME ),
bridge_object::Test_Impl_create,
bridge_object::getSupportedServiceNames() ) );