diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-08 15:04:56 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-08 16:03:37 +0100 |
commit | 8389519a23470b104b28ad497eb61a66ba92b81e (patch) | |
tree | eee1fb64d903c9318b45b1310ddc0cef62d9bdd2 /desktop | |
parent | 6dfc7d12c56fb585edff2cc4f6f37d53398cf751 (diff) |
Missing XServiceInfo
Change-Id: Ifc5454bbcd29730002b0a3261d2c34dee8ffb843
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/splash/splash.cxx | 18 | ||||
-rw-r--r-- | desktop/source/splash/unxsplash.cxx | 20 | ||||
-rw-r--r-- | desktop/source/splash/unxsplash.hxx | 13 |
3 files changed, 47 insertions, 4 deletions
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index ad06ead76938..3ce90a4c7296 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -26,9 +26,11 @@ #include <vcl/salnativewidgets.hxx> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/supportsservice.hxx> #include <rtl/bootstrap.hxx> #include <rtl/strbuf.hxx> #include <rtl/math.hxx> @@ -46,7 +48,7 @@ using namespace ::com::sun::star::uno; namespace { class SplashScreen - : public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization > + : public ::cppu::WeakImplHelper3< XStatusIndicator, XInitialization, XServiceInfo > , public IntroWindow { private: @@ -99,6 +101,18 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) throw ( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException) + { return desktop::splash::getImplementationName(); } + + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException) + { return cppu::supportsService(this, ServiceName); } + + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException) + { return desktop::splash::getSupportedServiceNames(); } + // workwindow virtual void Paint( const Rectangle& ); diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx index 665a106b1fec..6c1a8293bd62 100644 --- a/desktop/source/splash/unxsplash.cxx +++ b/desktop/source/splash/unxsplash.cxx @@ -22,6 +22,7 @@ #include <osl/process.h> //#include <com/sun/star/registry/XRegistryKey.hpp> #include <cppuhelper/implementationentry.hxx> +#include <cppuhelper/supportsservice.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> @@ -118,6 +119,25 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun:: } } } + +OUString UnxSplashScreen::getImplementationName() + throw (css::uno::RuntimeException) +{ + return UnxSplash_getImplementationName(); +} + +sal_Bool UnxSplashScreen::supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException) +{ + return cppu::supportsService(this, ServiceName); +} + +css::uno::Sequence<OUString> UnxSplashScreen::getSupportedServiceNames() + throw (css::uno::RuntimeException) +{ + return UnxSplash_getSupportedServiceNames(); +} + } using namespace desktop; diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index a1282bb667bc..fef8cef89f28 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -16,7 +16,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.h> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/mutex.hxx> @@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno; namespace desktop { -class UnxSplashScreen : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator, css::lang::XInitialization > +class UnxSplashScreen : public ::cppu::WeakImplHelper3< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo > { private: // don't allow anybody but ourselves to create instances of this class @@ -58,6 +58,15 @@ public: // XInitialize virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException ); + + virtual OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException); + + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException); + + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException); }; } |