From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: 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 --- bridges/test/java_uno/acquire/testacquire.cxx | 36 ++++++++--------- bridges/test/java_uno/any/transport.cxx | 1 - bridges/test/java_uno/equals/testequals.cxx | 46 +++++++++++----------- .../testnativethreadpoolclient.cxx | 28 ++++++------- .../testnativethreadpoolserver.cxx | 18 ++++----- bridges/test/testcomp.cxx | 2 - bridges/test/testcomp.h | 18 ++++----- 7 files changed, 73 insertions(+), 76 deletions(-) (limited to 'bridges/test') diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx index a0f5ef65cd91..e88be55b3e01 100644 --- a/bridges/test/java_uno/acquire/testacquire.cxx +++ b/bridges/test/java_uno/acquire/testacquire.cxx @@ -180,19 +180,19 @@ class Service: public cppu::WeakImplHelper3< css::lang::XServiceInfo, css::lang::XMain, test::javauno::acquire::XTest > { public: - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) { return getImplementationName_static(); } - virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName) + virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_static(); } virtual sal_Int32 SAL_CALL - run(css::uno::Sequence< rtl::OUString > const & arguments) + run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException); virtual void SAL_CALL setInterfaceToInterface( @@ -294,9 +294,9 @@ public: throw (css::uno::RuntimeException) { return obj; } - static rtl::OUString getImplementationName_static(); + static OUString getImplementationName_static(); - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( @@ -316,10 +316,10 @@ private: } -sal_Bool Service::supportsService(rtl::OUString const & serviceName) +sal_Bool Service::supportsService(OUString const & serviceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > names( + css::uno::Sequence< OUString > names( getSupportedServiceNames_static()); for (sal_Int32 i = 0; i< names.getLength(); ++i) { if (names[i] == serviceName) { @@ -341,7 +341,7 @@ template< typename T > void assertNotNull(css::uno::Reference< T > const & ref) } -sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) +sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments) throw (css::uno::RuntimeException) { // - arguments[0] must be the UNO URL to connect to: @@ -477,13 +477,13 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments) return 0; } -rtl::OUString Service::getImplementationName_static() { - return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" ); +OUString Service::getImplementationName_static() { + return OUString( "com.sun.star.test.bridges.testacquire.impl" ); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() { - css::uno::Sequence< rtl::OUString > names(1); - names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" ); +css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { + css::uno::Sequence< OUString > names(1); + names[0] = OUString( "com.sun.star.test.bridges.testacquire" ); return names; } @@ -515,11 +515,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const namespace { -bool writeInfo(void * registryKey, rtl::OUString const & implementationName, - css::uno::Sequence< rtl::OUString > const & serviceNames) { - rtl::OUString keyName( "/" ); +bool writeInfo(void * registryKey, OUString const & implementationName, + css::uno::Sequence< OUString > const & serviceNames) { + OUString keyName( "/" ); keyName += implementationName; - keyName += rtl::OUString( "/UNO/SERVICES" ); + keyName += OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > key; try { key = static_cast< css::registry::XRegistryKey * >(registryKey)-> diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx index fda624987eca..2200e322871a 100644 --- a/bridges/test/java_uno/any/transport.cxx +++ b/bridges/test/java_uno/any/transport.cxx @@ -32,7 +32,6 @@ using namespace ::com::sun::star::uno; using ::test::java_uno::anytest::XTransport; -using ::rtl::OUString; namespace { diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx index 5c274934465c..a56e5b928a39 100644 --- a/bridges/test/java_uno/equals/testequals.cxx +++ b/bridges/test/java_uno/equals/testequals.cxx @@ -52,28 +52,28 @@ class Service: public cppu::WeakImplHelper2< css::lang::XServiceInfo, test::java_uno::equals::XTestInterface > { public: - virtual inline rtl::OUString SAL_CALL getImplementationName() + virtual inline OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) - { return rtl::OUString::createFromAscii(getImplementationName_static()); } + { return OUString::createFromAscii(getImplementationName_static()); } virtual sal_Bool SAL_CALL supportsService( - rtl::OUString const & rServiceName) throw (css::uno::RuntimeException); + OUString const & rServiceName) throw (css::uno::RuntimeException); - virtual inline css::uno::Sequence< rtl::OUString > SAL_CALL + virtual inline css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) { return getSupportedServiceNames_static(); } - virtual void SAL_CALL connect(rtl::OUString const & rConnection, - rtl::OUString const & rProtocol) + virtual void SAL_CALL connect(OUString const & rConnection, + OUString const & rProtocol) throw (css::uno::Exception); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL get( - rtl::OUString const & rName) throw (css::uno::RuntimeException); + OUString const & rName) throw (css::uno::RuntimeException); static inline sal_Char const * getImplementationName_static() { return "com.sun.star.test.bridges.testequals.impl"; } - static css::uno::Sequence< rtl::OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( @@ -91,10 +91,10 @@ private: } -sal_Bool Service::supportsService(rtl::OUString const & rServiceName) +sal_Bool Service::supportsService(OUString const & rServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< rtl::OUString > aNames( + css::uno::Sequence< OUString > aNames( getSupportedServiceNames_static()); for (sal_Int32 i = 0; i< aNames.getLength(); ++i) if (aNames[i] == rServiceName) @@ -102,31 +102,31 @@ sal_Bool Service::supportsService(rtl::OUString const & rServiceName) return false; } -void Service::connect(rtl::OUString const & rConnection, - rtl::OUString const & rProtocol) +void Service::connect(OUString const & rConnection, + OUString const & rProtocol) throw (css::uno::Exception) { css::uno::Reference< css::connection::XConnection > xConnection( css::connection::Connector::create(m_xContext)->connect(rConnection)); css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory( m_xContext->getServiceManager()->createInstanceWithContext( - rtl::OUString( "com.sun.star.bridge.BridgeFactory" ), + OUString( "com.sun.star.bridge.BridgeFactory" ), m_xContext), css::uno::UNO_QUERY); - m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol, + m_xBridge = xBridgeFactory->createBridge(OUString(), rProtocol, xConnection, 0); } css::uno::Reference< css::uno::XInterface > -Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException) +Service::get(OUString const & rName) throw (css::uno::RuntimeException) { return m_xBridge->getInstance(rName); } -css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() +css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() { - css::uno::Sequence< rtl::OUString > aNames(1); - aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" ); + css::uno::Sequence< OUString > aNames(1); + aNames[0] = OUString( "com.sun.star.test.bridges.testequals" ); return aNames; } @@ -160,7 +160,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co css::uno::Reference< css::lang::XSingleComponentFactory > xFactory(cppu::createSingleComponentFactory( &Service::createInstance, - rtl::OUString::createFromAscii( + OUString::createFromAscii( Service::getImplementationName_static()), Service::getSupportedServiceNames_static())); if (xFactory.is()) @@ -175,11 +175,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co namespace { bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName, - css::uno::Sequence< rtl::OUString > const & rServiceNames) + css::uno::Sequence< OUString > const & rServiceNames) { - rtl::OUString aKeyName( "/" ); - aKeyName += rtl::OUString::createFromAscii(pImplementationName); - aKeyName += rtl::OUString( "/UNO/SERVICES" ); + OUString aKeyName( "/" ); + aKeyName += OUString::createFromAscii(pImplementationName); + aKeyName += OUString( "/UNO/SERVICES" ); css::uno::Reference< css::registry::XRegistryKey > xKey; try { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx index 907b4b41f2bd..d5a66169a634 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx @@ -59,7 +59,7 @@ public: private: virtual ~Client() {} - virtual sal_Int32 SAL_CALL run(css::uno::Sequence< rtl::OUString > const &) + virtual sal_Int32 SAL_CALL run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException); virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException); @@ -68,34 +68,34 @@ private: osl::ThreadData data; }; -sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) +sal_Int32 Client::run(css::uno::Sequence< OUString > const &) throw (css::uno::RuntimeException) { css::uno::Reference< css::lang::XMultiComponentFactory > factory( context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( "no component context service manager" ), + OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay; try { relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >( factory->createInstanceWithContext( - rtl::OUString( "test.javauno.nativethreadpool.Relay" ), + OUString( "test.javauno.nativethreadpool.Relay" ), context), css::uno::UNO_QUERY_THROW); } catch (css::uno::RuntimeException &) { throw; } catch (css::uno::Exception & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ), + OUString( "creating test.javauno.nativethreadpool.Relay service" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } relay->start(this); if (!data.setData(reinterpret_cast< void * >(12345))) { throw new css::uno::RuntimeException( - rtl::OUString( "osl::ThreadData::setData failed" ), + OUString( "osl::ThreadData::setData failed" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &) source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )), + OUString( "uno:socket,host=localhost,port=3830;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } bool success = source->get() == 12345; @@ -134,12 +134,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Client(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( "test.javauno.nativethreadpool.client" ); +OUString SAL_CALL getImplementationName() { + return OUString( "test.javauno.nativethreadpool.client" ); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } cppu::ImplementationEntry entries[] = { diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx index 6b7490b7732a..d81876f91895 100644 --- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx +++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx @@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { context->getServiceManager()); if (!factory.is()) { throw new css::uno::RuntimeException( - rtl::OUString( "no component context service manager" ), + OUString( "no component context service manager" ), static_cast< cppu::OWeakObject * >(this)); } css::uno::Reference< test::javauno::nativethreadpool::XSource > source; @@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) { source = css::uno::Reference< test::javauno::nativethreadpool::XSource >( css::bridge::UnoUrlResolver::create(context)->resolve( - rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), + OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )), css::uno::UNO_QUERY_THROW); } catch (css::connection::NoConnectException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::connection::ConnectionSetupException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } catch (css::lang::IllegalArgumentException & e) { throw css::lang::WrappedTargetRuntimeException( - rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), + OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ), static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e)); } return source->get(); @@ -98,12 +98,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create( return static_cast< cppu::OWeakObject * >(new Server(context)); } -rtl::OUString SAL_CALL getImplementationName() { - return rtl::OUString( "test.javauno.nativethreadpool.server" ); +OUString SAL_CALL getImplementationName() { + return OUString( "test.javauno.nativethreadpool.server" ); } -css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() { - return css::uno::Sequence< rtl::OUString >(); +css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() { + return css::uno::Sequence< OUString >(); } cppu::ImplementationEntry entries[] = { diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx index 08248b0952fe..2ccda76c5c26 100644 --- a/bridges/test/testcomp.cxx +++ b/bridges/test/testcomp.cxx @@ -44,8 +44,6 @@ using namespace ::com::sun::star::bridge; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::test::performance; -using ::rtl::OUString; -using ::rtl::OUStringToOString; #include "testcomp.h" diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h index 67b796d720a4..75bd05e81e4f 100644 --- a/bridges/test/testcomp.h +++ b/bridges/test/testcomp.h @@ -24,13 +24,13 @@ void parseCommandLine( char *argv[] , - ::rtl::OUString *pProtocol , ::rtl::OUString *pConnection , + OUString *pProtocol , OUString *pConnection , sal_Bool *pbLatency , sal_Bool *pbReverse); Reference< XInterface > createComponent( - const ::rtl::OUString &sServiceName, - const ::rtl::OUString &sDllName, + const OUString &sServiceName, + const OUString &sDllName, const Reference < XMultiServiceFactory > & rSMgr ); class OInterfaceTest : @@ -75,16 +75,16 @@ public: void SAL_CALL release()throw() { OWeakObject::release(); } public: // XCallMe - virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo ) + virtual void SAL_CALL call( const OUString& s, sal_Int32 nToDo ) throw(::com::sun::star::uno::RuntimeException, ::test::TestBridgeException); - virtual void SAL_CALL callOneway( const ::rtl::OUString& s, sal_Int32 nToDo ) + virtual void SAL_CALL callOneway( const OUString& s, sal_Int32 nToDo ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL drawLine( sal_Int32 x1, sal_Int32 y1 , sal_Int32 x2 , sal_Int32 y2 ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setsAttribute( const ::rtl::OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setsAttribute( const OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL callAgain( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callAgain, sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException); @@ -92,7 +92,7 @@ public: throw(::com::sun::star::uno::RuntimeException); ::osl::Mutex m_mutex; - ::rtl::OUString m_sAttribute; + OUString m_sAttribute; sal_Int32 m_nLastToDos; }; @@ -136,7 +136,7 @@ public: public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - getInstance( const ::rtl::OUString& sObjectName ) + getInstance( const OUString& sObjectName ) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); -- cgit