diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-08 15:19:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:43 +0200 |
| commit | 4d5801a0c6770b2e1e4ecf289523396fbc090379 (patch) | |
| tree | ce6355cfe3ecfdab7f5d21e144a9057a46bfd205 /framework | |
| parent | Convert framework::StatusBarManager to WeakImplHelper (diff) | |
| download | core-4d5801a0c6770b2e1e4ecf289523396fbc090379.tar.gz core-4d5801a0c6770b2e1e4ecf289523396fbc090379.zip | |
convert WindowStateConfiguration to WeakImplHelper
It was already half way there, just some leftover macro definitions.
Change-Id: I607eb22d08fd0e5d7d0be0b8bb217bcc7740d983
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uiconfiguration/windowstateconfiguration.hxx | 4 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/windowstateconfiguration.cxx | 15 |
2 files changed, 1 insertions, 18 deletions
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx index afb760ad3599..35e94a551fb5 100644 --- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx +++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx @@ -63,15 +63,13 @@ namespace framework #define WINDOWSTATE_PROPERTY_CONTEXTACTIVE "ContextActive" class WindowStateConfiguration : private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. - public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameAccess, css::lang::XServiceInfo> + public ::cppu::WeakImplHelper2< css::container::XNameAccess, css::lang::XServiceInfo> { public: WindowStateConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); virtual ~WindowStateConfiguration(); // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER DECLARE_XSERVICEINFO // XNameAccess diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx index c357e85cb6ae..3c1254705f0a 100644 --- a/framework/source/uiconfiguration/windowstateconfiguration.cxx +++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx @@ -1330,21 +1330,6 @@ sal_Bool ConfigurationAccess_WindowState::impl_initializeConfigAccess() //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** -DEFINE_XINTERFACE_4 ( WindowStateConfiguration , - OWeakObject , - DIRECT_INTERFACE( css::lang::XTypeProvider ), - DIRECT_INTERFACE( css::lang::XServiceInfo ), - DIRECT_INTERFACE( css::container::XNameAccess ), - DERIVED_INTERFACE( css::container::XElementAccess, css::container::XNameAccess ) - ) - -DEFINE_XTYPEPROVIDER_4 ( WindowStateConfiguration , - css::lang::XTypeProvider , - css::lang::XServiceInfo , - css::container::XNameAccess , - css::container::XElementAccess - ) - DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2( WindowStateConfiguration , ::cppu::OWeakObject , DECLARE_ASCII("com.sun.star.ui.WindowStateConfiguration"), |