diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-08 15:43:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:45 +0200 |
| commit | 5e184fd2173481601e7ee2f24029ad0a4c9d7da9 (patch) | |
| tree | 568f686b9c7ec52bc3d3bb4579624e1d5a9117bc /framework | |
| parent | 0abf81ca5044fa5c83c04867f8aad32b789923c8 (diff) | |
Convert GlobalSettings_Access to WeakImplHelper
Change-Id: Iaa1134bee8e3b36e940376622b5c22085892b81b
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uiconfiguration/globalsettings.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
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 <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase2.hxx> //_________________________________________________________________________________________________________________ // 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(), |