From e6534a6099cc667dba3fe154023cf2c573fda9f1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 29 Sep 2015 15:07:23 +0200 Subject: com::sun::star->css in embeddedobj/ Change-Id: Ia04fc28ce8e1d70f86520edf2df8c98f7b455465 Reviewed-on: https://gerrit.libreoffice.org/19024 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- embeddedobj/test/MainThreadExecutor/xexecutor.hxx | 30 +++++++++++----------- embeddedobj/test/mtexecutor/bitmapcreator.hxx | 22 ++++++++-------- embeddedobj/test/mtexecutor/mainthreadexecutor.hxx | 28 ++++++++++---------- 3 files changed, 40 insertions(+), 40 deletions(-) (limited to 'embeddedobj/test') diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx index a68de43f394e..13b37e59a290 100644 --- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx +++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx @@ -28,45 +28,45 @@ #include -class UNOMainThreadExecutor : public ::cppu::WeakImplHelper< ::com::sun::star::task::XJob, - ::com::sun::star::lang::XServiceInfo > +class UNOMainThreadExecutor : public ::cppu::WeakImplHelper< css::task::XJob, + css::lang::XServiceInfo > { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; + css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; public: UNOMainThreadExecutor( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) + const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) : m_xFactory( xFactory ) { } - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); static OUString SAL_CALL impl_staticGetImplementationName(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); + const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XJob - 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); + virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException); // XServiceInfo - 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); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); }; class MainThreadExecutor_Impl { - ::com::sun::star::uno::Reference< ::com::sun::star::task::XJob > m_xJob; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aArgs; + css::uno::Reference< css::task::XJob > m_xJob; + css::uno::Sequence< css::beans::NamedValue > m_aArgs; sal_Bool m_bExecuted; public: - MainThreadExecutor_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XJob >& xJob, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aArguments ); + MainThreadExecutor_Impl( const css::uno::Reference< css::task::XJob >& xJob, + const css::uno::Sequence< css::beans::NamedValue >& aArguments ); void execute(); diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx index 5edb76e43347..5218031d77cf 100644 --- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx +++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx @@ -28,30 +28,30 @@ #include class VCLBitmapCreator : public ::cppu::WeakImplHelper< - ::com::sun::star::lang::XSingleServiceFactory, - ::com::sun::star::lang::XServiceInfo > + css::lang::XSingleServiceFactory, + css::lang::XServiceInfo > { public: VCLBitmapCreator( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) + const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) {} - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); 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 ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( + const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); // XSingleServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - 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); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( ) throw (css::uno::Exception, css::uno::RuntimeException); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException); // XServiceInfo - 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); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); }; diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx index afb99af9f414..4eecd48cb058 100644 --- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx +++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx @@ -31,43 +31,43 @@ class MainThreadExecutorRequest { - ::com::sun::star::uno::Reference< ::com::sun::star::task::XJob > m_xJob; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aValues; + css::uno::Reference< css::task::XJob > m_xJob; + css::uno::Sequence< css::beans::NamedValue > m_aValues; public: MainThreadExecutorRequest( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XJob >& xJob, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aValues ); + const css::uno::Reference< css::task::XJob >& xJob, + const css::uno::Sequence< css::beans::NamedValue >& aValues ); void doIt(); }; class MainThreadExecutor : public ::cppu::WeakImplHelper< - ::com::sun::star::task::XJob, - ::com::sun::star::lang::XServiceInfo > + css::task::XJob, + css::lang::XServiceInfo > { public: MainThreadExecutor( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) + const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ) {} - static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); + static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames(); 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 ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_staticCreateSelfInstance( + const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); DECL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest* ); // XJob - 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); + virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& Arguments ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException); // XServiceInfo - 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); + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); }; -- cgit v1.2.3