diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-08 15:40:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:44 +0200 |
| commit | 0abf81ca5044fa5c83c04867f8aad32b789923c8 (patch) | |
| tree | f6a1c847cf867275709928255186b6921de46d33 /framework | |
| parent | Convert UIConfigurationManager to WeakImplHelper (diff) | |
| download | core-0abf81ca5044fa5c83c04867f8aad32b789923c8.tar.gz core-0abf81ca5044fa5c83c04867f8aad32b789923c8.zip | |
Convert ModuleUIConfigurationManagerSupplier to WeakImplHelper
Change-Id: I526eb65bb00808c85caa8fcba3359321e7cec2da
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uiconfiguration/moduleuicfgsupplier.hxx | 16 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 14 |
2 files changed, 6 insertions, 24 deletions
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx index a23b8745cb71..3e6ffd1bcc99 100644 --- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx +++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx @@ -45,24 +45,20 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/implbase3.hxx> #include <rtl/ustring.hxx> namespace framework { - class ModuleUIConfigurationManagerSupplier : public com::sun::star::lang::XTypeProvider , - public com::sun::star::lang::XServiceInfo , - public com::sun::star::lang::XComponent , - public ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::OWeakObject + class ModuleUIConfigurationManagerSupplier : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public cppu::WeakImplHelper3< + com::sun::star::lang::XServiceInfo , + com::sun::star::lang::XComponent , + com::sun::star::ui::XModuleUIConfigurationManagerSupplier > { public: // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO ModuleUIConfigurationManagerSupplier( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 6ed1210a52d9..89c761d3b9a0 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -73,20 +73,6 @@ class RootStorageWrapper : public ::cppu::WeakImplHelper1< com::sun::star::embe //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_4 ( ModuleUIConfigurationManagerSupplier , - OWeakObject , - DIRECT_INTERFACE( css::lang::XTypeProvider ), - DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::lang::XComponent ), - DIRECT_INTERFACE( ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier ) - ) - -DEFINE_XTYPEPROVIDER_4 ( ModuleUIConfigurationManagerSupplier , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XComponent , - ::com::sun::star::ui::XModuleUIConfigurationManagerSupplier - ) DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( ModuleUIConfigurationManagerSupplier , ::cppu::OWeakObject , |