Kaydet (Commit) 8389519a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Missing XServiceInfo

Change-Id: Ifc5454bbcd29730002b0a3261d2c34dee8ffb843
üst 6dfc7d12
...@@ -26,9 +26,11 @@ ...@@ -26,9 +26,11 @@
#include <vcl/salnativewidgets.hxx> #include <vcl/salnativewidgets.hxx>
#include <com/sun/star/lang/XInitialization.hpp> #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/registry/XRegistryKey.hpp>
#include <com/sun/star/task/XStatusIndicator.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/bootstrap.hxx>
#include <rtl/strbuf.hxx> #include <rtl/strbuf.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
...@@ -46,7 +48,7 @@ using namespace ::com::sun::star::uno; ...@@ -46,7 +48,7 @@ using namespace ::com::sun::star::uno;
namespace { namespace {
class SplashScreen class SplashScreen
: public ::cppu::WeakImplHelper2< XStatusIndicator, XInitialization > : public ::cppu::WeakImplHelper3< XStatusIndicator, XInitialization, XServiceInfo >
, public IntroWindow , public IntroWindow
{ {
private: private:
...@@ -99,6 +101,18 @@ public: ...@@ -99,6 +101,18 @@ public:
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments ) virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
throw ( RuntimeException ); 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 // workwindow
virtual void Paint( const Rectangle& ); virtual void Paint( const Rectangle& );
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <osl/process.h> #include <osl/process.h>
//#include <com/sun/star/registry/XRegistryKey.hpp> //#include <com/sun/star/registry/XRegistryKey.hpp>
#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
...@@ -118,6 +119,25 @@ UnxSplashScreen::initialize( const ::com::sun::star::uno::Sequence< ::com::sun:: ...@@ -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; using namespace desktop;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/interfacecontainer.h>
#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
...@@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno; ...@@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno;
namespace desktop { 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: private:
// don't allow anybody but ourselves to create instances of this class // don't allow anybody but ourselves to create instances of this class
...@@ -58,6 +58,15 @@ public: ...@@ -58,6 +58,15 @@ public:
// XInitialize // XInitialize
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any>& aArguments ) throw ( css::uno::RuntimeException ); 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);
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment