summaryrefslogtreecommitdiff
path: root/embeddedobj/test/mtexecutor
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /embeddedobj/test/mtexecutor
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'embeddedobj/test/mtexecutor')
-rw-r--r--embeddedobj/test/mtexecutor/bitmapcreator.cxx16
-rw-r--r--embeddedobj/test/mtexecutor/bitmapcreator.hxx10
-rw-r--r--embeddedobj/test/mtexecutor/mainthreadexecutor.cxx16
-rw-r--r--embeddedobj/test/mtexecutor/mainthreadexecutor.hxx10
-rw-r--r--embeddedobj/test/mtexecutor/mteregister.cxx12
5 files changed, 32 insertions, 32 deletions
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index 593741078374..7f0907835681 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
@@ -26,18 +26,18 @@
using namespace ::com::sun::star;
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames()
{
- uno::Sequence< ::rtl::OUString > aRet(2);
+ uno::Sequence< OUString > aRet(2);
aRet[0] = "com.sun.star.embed.BitmapCreator";
aRet[1] = "com.sun.star.comp.embed.BitmapCreator";
return aRet;
}
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName()
+OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName()
{
- return ::rtl::OUString("com.sun.star.comp.embed.BitmapCreator");
+ return OUString("com.sun.star.comp.embed.BitmapCreator");
}
//-------------------------------------------------------------------------
@@ -84,17 +84,17 @@ uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstanceWithA
}
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL VCLBitmapCreator::getImplementationName()
+OUString SAL_CALL VCLBitmapCreator::getImplementationName()
throw ( uno::RuntimeException )
{
return impl_staticGetImplementationName();
}
//-------------------------------------------------------------------------
-sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const OUString& ServiceName )
throw ( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
+ uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
if ( ServiceName == aSeq[nInd] )
@@ -104,7 +104,7 @@ sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const ::rtl::OUString& Serv
}
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames()
throw ( uno::RuntimeException )
{
return impl_staticGetSupportedServiceNames();
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index aeb0a6d68111..6770347c54f5 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -37,9 +37,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory )
{}
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
- static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+ static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
@@ -49,9 +49,9 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 084efe6c5f21..788c0e819fd1 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -24,18 +24,18 @@
using namespace ::com::sun::star;
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames()
{
- uno::Sequence< ::rtl::OUString > aRet(2);
+ uno::Sequence< OUString > aRet(2);
aRet[0] = "com.sun.star.thread.MainThreadExecutor";
aRet[1] = "com.sun.star.comp.thread.MainThreadExecutor";
return aRet;
}
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName()
+OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName()
{
- return ::rtl::OUString("com.sun.star.comp.thread.MainThreadExecutor");
+ return OUString("com.sun.star.comp.thread.MainThreadExecutor");
}
//-------------------------------------------------------------------------
@@ -85,17 +85,17 @@ IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThrea
}
//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL MainThreadExecutor::getImplementationName()
+OUString SAL_CALL MainThreadExecutor::getImplementationName()
throw ( uno::RuntimeException )
{
return impl_staticGetImplementationName();
}
//-------------------------------------------------------------------------
-sal_Bool SAL_CALL MainThreadExecutor::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL MainThreadExecutor::supportsService( const OUString& ServiceName )
throw ( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
+ uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
if ( ServiceName == aSeq[nInd] )
@@ -105,7 +105,7 @@ sal_Bool SAL_CALL MainThreadExecutor::supportsService( const ::rtl::OUString& Se
}
//-------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames()
throw ( uno::RuntimeException )
{
return impl_staticGetSupportedServiceNames();
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index fb2da650fcd0..a1a12b6b6222 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
@@ -52,9 +52,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory )
{}
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+ static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
- static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
+ static OUString SAL_CALL impl_staticGetImplementationName();
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
@@ -65,9 +65,9 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index 7ef94d2cf6df..d3fffbb03699 100644
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -33,7 +33,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImp
{
void * pRet = 0;
- ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplName ) );
+ OUString aImplName( OUString::createFromAscii( pImplName ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
if ( pServiceManager )
@@ -73,20 +73,20 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
uno::Reference< registry::XRegistryKey > xNewKey;
- uno::Sequence< ::rtl::OUString > rServices;
+ uno::Sequence< OUString > rServices;
sal_Int32 ind = 0;
- xNewKey = xKey->createKey( ::rtl::OUString("/") +
+ xNewKey = xKey->createKey( OUString("/") +
MainThreadExecutor::impl_staticGetImplementationName() +
- ::rtl::OUString( "/UNO/SERVICES") );
+ OUString( "/UNO/SERVICES") );
rServices = MainThreadExecutor::impl_staticGetSupportedServiceNames();
for( ind = 0; ind < rServices.getLength(); ind++ )
xNewKey->createKey( rServices.getConstArray()[ind] );
- xNewKey = xKey->createKey( ::rtl::OUString("/") +
+ xNewKey = xKey->createKey( OUString("/") +
VCLBitmapCreator::impl_staticGetImplementationName() +
- ::rtl::OUString( "/UNO/SERVICES") );
+ OUString( "/UNO/SERVICES") );
rServices = VCLBitmapCreator::impl_staticGetSupportedServiceNames();
for( ind = 0; ind < rServices.getLength(); ind++ )