From 5e184fd2173481601e7ee2f24029ad0a4c9d7da9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 8 Jul 2013 15:43:41 +0200 Subject: Convert GlobalSettings_Access to WeakImplHelper Change-Id: Iaa1134bee8e3b36e940376622b5c22085892b81b --- framework/source/uiconfiguration/globalsettings.cxx | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'framework/source') diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 2f0eb7175054..79c6aa732ca7 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -32,7 +32,7 @@ #include #include -#include +#include //_________________________________________________________________________________________________________________ // Defines @@ -59,18 +59,15 @@ namespace framework // Configuration access class for WindowState supplier implementation //***************************************************************************************************************** -class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , - public ::com::sun::star::lang::XEventListener , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::OWeakObject +class GlobalSettings_Access : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::WeakImplHelper2< + ::com::sun::star::lang::XComponent, + ::com::sun::star::lang::XEventListener> { public: GlobalSettings_Access( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~GlobalSettings_Access(); - // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - // XComponent virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -99,13 +96,6 @@ class GlobalSettings_Access : public ::com::sun::star::lang::XComponent , //***************************************************************************************************************** -// XInterface -//***************************************************************************************************************** -DEFINE_XINTERFACE_2 ( GlobalSettings_Access , - OWeakObject , - DIRECT_INTERFACE ( css::lang::XComponent ), - DIRECT_INTERFACE ( css::lang::XEventListener ) - ) GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) : ThreadHelpBase(), -- cgit