diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-08 15:38:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:44 +0200 |
| commit | 496a281d38c9842e15825bab1105ca27cb1ed4e7 (patch) | |
| tree | 7f011c3cfb61eb816be6b7e50c0ca05b7a83bfc1 /framework | |
| parent | a19e9a5cd040e291c4bdbbde99b34b763af4d7ef (diff) | |
Convert UIConfigurationManager to WeakImplHelper
Change-Id: I1e8a498f38e19419d3f8fdc91c0bcaf2cb3f41a5
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uiconfiguration/uiconfigurationmanager.hxx | 14 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/uiconfigurationmanager.cxx | 23 |
2 files changed, 5 insertions, 32 deletions
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx index 887e749f6af8..1c5ba86eaba4 100644 --- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx @@ -45,23 +45,19 @@ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/implbase2.hxx> #include <rtl/ustring.hxx> namespace framework { - class UIConfigurationManager : public com::sun::star::lang::XTypeProvider , - public com::sun::star::lang::XServiceInfo , - public com::sun::star::ui::XUIConfigurationManager2 , - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::OWeakObject + class UIConfigurationManager : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + public ::cppu::WeakImplHelper2< + com::sun::star::lang::XServiceInfo , + com::sun::star::ui::XUIConfigurationManager2 > { public: // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO UIConfigurationManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rxContext ); diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 82367ab6957c..799a3f3ab207 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -61,29 +61,6 @@ namespace framework //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_8 ( UIConfigurationManager , - OWeakObject , - DIRECT_INTERFACE( css::lang::XTypeProvider ), - DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::lang::XComponent ), - DIRECT_INTERFACE( css::ui::XUIConfiguration ), - DIRECT_INTERFACE( css::ui::XUIConfigurationManager ), - DIRECT_INTERFACE( css::ui::XUIConfigurationManager2 ), - DIRECT_INTERFACE( css::ui::XUIConfigurationPersistence ), - DIRECT_INTERFACE( css::ui::XUIConfigurationStorage ) - ) - -DEFINE_XTYPEPROVIDER_8 ( UIConfigurationManager , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::lang::XComponent , - css::ui::XUIConfiguration , - css::ui::XUIConfigurationManager , - css::ui::XUIConfigurationManager2 , - css::ui::XUIConfigurationPersistence , - css::ui::XUIConfigurationStorage - ) - DEFINE_XSERVICEINFO_MULTISERVICE_2 ( UIConfigurationManager , ::cppu::OWeakObject , OUString("com.sun.star.ui.UIConfigurationManager"), |