diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-24 15:22:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-24 18:08:39 +0100 |
| commit | c6dcd7b7f392ef47b2e66445239ce867e51d5adb (patch) | |
| tree | 2eed08975ce69c4e00d4ab0530eb1222622edab4 /embedserv/source/inc/servprov.hxx | |
| parent | f17568f9f3ea6cded3fe13437977ef841d56a7c1 (diff) | |
Fix various Windows-only XServiceInfo implementations
...to match what is recorded in the .component files
Change-Id: Ibc5bb0575f3869317e4d14614cf1dad0af728ddc
Diffstat (limited to 'embedserv/source/inc/servprov.hxx')
| -rw-r--r-- | embedserv/source/inc/servprov.hxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx index 1c0a012b26c8..c74458d0ec20 100644 --- a/embedserv/source/inc/servprov.hxx +++ b/embedserv/source/inc/servprov.hxx @@ -25,29 +25,26 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <cppuhelper/weak.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/implbase.hxx> class EmbedProviderFactory_Impl; -class EmbedServer_Impl : public ::cppu::OWeakObject, ::com::sun::star::lang::XTypeProvider +class EmbedServer_Impl: public cppu::WeakImplHelper<css::lang::XServiceInfo> { public: EmbedServer_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > &xFactory ); virtual ~EmbedServer_Impl(); - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) - throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException); + OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: |