diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-28 10:36:40 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-28 10:36:51 +0200 |
commit | 2094610175140023cf8f904f8506c189e36dec06 (patch) | |
tree | ccf64dab3545a2e1e7e55fc288e929cc88746598 /desktop/source/offacc | |
parent | ca97ee598a08365f7bef7e7b8172bff4433ee8b0 (diff) |
namespacing cleanup
Change-Id: I1384bf53a29e174bb97db4c0644f9dce39c0e36d
Diffstat (limited to 'desktop/source/offacc')
-rw-r--r-- | desktop/source/offacc/acceptor.cxx | 7 | ||||
-rw-r--r-- | desktop/source/offacc/acceptor.hxx | 63 |
2 files changed, 33 insertions, 37 deletions
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 21b97f4ad7b4..a9b08f476d3a 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -25,6 +25,13 @@ #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> +using namespace ::osl; +using namespace css::bridge; +using namespace css::connection; +using namespace css::container; +using namespace css::lang; +using namespace css::uno; + namespace desktop { diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index 0cb2dd3f6472..76d08a45ed07 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -37,38 +37,27 @@ #include <osl/conditn.hxx> #include <osl/thread.hxx> - -using namespace ::rtl; -using namespace ::osl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::bridge; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::connection; -using namespace ::com::sun::star::container; -using namespace ::com::sun::star::registry; - namespace desktop { class Acceptor - : public ::cppu::WeakImplHelper2<XServiceInfo, XInitialization> + : public ::cppu::WeakImplHelper2<css::lang::XServiceInfo, css::lang::XInitialization> { private: static const sal_Char *serviceName; static const sal_Char *implementationName; static const sal_Char *supportedServiceNames[]; - static Mutex m_aMutex; + static ::osl::Mutex m_aMutex; oslThread m_thread; comphelper::WeakBag< com::sun::star::bridge::XBridge > m_bridges; - Condition m_cEnable; + ::osl::Condition m_cEnable; - Reference< XMultiServiceFactory > m_rSMgr; - Reference< XComponentContext > m_rContext; - Reference< XAcceptor > m_rAcceptor; - Reference< XBridgeFactory2 > m_rBridgeFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > m_rSMgr; + css::uno::Reference< css::uno::XComponentContext > m_rContext; + css::uno::Reference< css::connection::XAcceptor > m_rAcceptor; + css::uno::Reference< css::bridge::XBridgeFactory2 > m_rBridgeFactory; OUString m_aAcceptString; OUString m_aConnectString; @@ -78,42 +67,42 @@ private: bool m_bDying; public: - Acceptor( const Reference< XMultiServiceFactory >& aFactory ); + Acceptor( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory ); virtual ~Acceptor(); void SAL_CALL run(); // XService info - static OUString impl_getImplementationName(); - virtual OUString SAL_CALL getImplementationName() - throw (RuntimeException); - static Sequence<OUString> impl_getSupportedServiceNames(); - virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) - throw (RuntimeException); + static OUString impl_getImplementationName(); + virtual OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException); + static css::uno::Sequence<OUString> impl_getSupportedServiceNames(); + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) + throw (css::uno::RuntimeException); // XInitialize - virtual void SAL_CALL initialize( const Sequence<Any>& aArguments ) - throw ( Exception ); + virtual void SAL_CALL initialize( const css::uno::Sequence<css::uno::Any>& aArguments ) + throw ( css::uno::Exception ); - static Reference<XInterface> impl_getInstance( const Reference< XMultiServiceFactory >& aFactory ); + static css::uno::Reference<css::uno::XInterface> impl_getInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory ); }; -class AccInstanceProvider : public ::cppu::WeakImplHelper1<XInstanceProvider> +class AccInstanceProvider : public ::cppu::WeakImplHelper1<css::bridge::XInstanceProvider> { private: - Reference<XMultiServiceFactory> m_rSMgr; - Reference<XConnection> m_rConnection; + css::uno::Reference<css::lang::XMultiServiceFactory> m_rSMgr; + css::uno::Reference<css::connection::XConnection> m_rConnection; public: - AccInstanceProvider(const Reference< XMultiServiceFactory >& aFactory, - const Reference< XConnection >& rConnection); + AccInstanceProvider(const css::uno::Reference< css::lang::XMultiServiceFactory >& aFactory, + const css::uno::Reference< css::connection::XConnection >& rConnection); virtual ~AccInstanceProvider(); // XInstanceProvider - virtual Reference<XInterface> SAL_CALL getInstance (const OUString& aName ) - throw ( NoSuchElementException ); + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getInstance (const OUString& aName ) + throw ( css::container::NoSuchElementException ); }; |