convert more services in framework module to WeakImplHelper

Change-Id: I417ae2ce644f39fce0e8eb9fbe6a3a3c783b6227

30 files changed, 114 insertions, 393 deletions

diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 96ef71c6609a..af21194e2cd7 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <vcl/evntpost.hxx>
 
 
@@ -57,12 +57,11 @@ namespace framework{
                     or some other menu entries. Or we terminate the whole application in case this backing mode shouldnt
                     be used.
  */
-class CloseDispatcher : public css::lang::XTypeProvider
-                      , public css::frame::XNotifyingDispatch             // => XDispatch
-                      , public css::frame::XDispatchInformationProvider
-                        // baseclasses ... order is necessary for right initialization!
-                      , private ThreadHelpBase
-                      , public  ::cppu::OWeakObject
+class CloseDispatcher : // baseclasses ... order is necessary for right initialization!
+                        private ThreadHelpBase
+                      , public  ::cppu::WeakImplHelper2<
+                                    css::frame::XNotifyingDispatch,             // => XDispatch
+                                    css::frame::XDispatchInformationProvider >
 {
     //-------------------------------------------
     // types
@@ -156,10 +155,6 @@ class CloseDispatcher : public css::lang::XTypeProvider
     public:
 
         //---------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
-        //---------------------------------------
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index cac95722ed6d..fe7a2e50f752 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -32,7 +32,7 @@
 
 #include <cppuhelper/weakref.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <vcl/svapp.hxx>
 
 namespace framework{
@@ -40,9 +40,8 @@ namespace framework{
 /*-************************************************************************************************************//**
     @short          a helper to merge dispatch information of different sources together.
 *//*-*************************************************************************************************************/
-class DispatchInformationProvider : public  css::frame::XDispatchInformationProvider
-                                  , private ThreadHelpBase
-                                  , public  ::cppu::OWeakObject
+class DispatchInformationProvider : private ThreadHelpBase
+                                  , public  ::cppu::WeakImplHelper1< css::frame::XDispatchInformationProvider >
 {
     //_______________________
     // member
@@ -60,8 +59,6 @@ class DispatchInformationProvider : public  css::frame::XDispatchInformationProv
 
         virtual ~DispatchInformationProvider();
 
-        FWK_DECLARE_XINTERFACE
-
         virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups()
             throw (css::uno::RuntimeException);
 
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index 777463b297ed..3a904a9c4345 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weakref.hxx>
 
 namespace framework{
@@ -78,14 +78,12 @@ enum EDispatchHelper
     @devstatus      ready to use
     @threadsafe     yes
 */
-class DispatchProvider  :   // interfaces
-                            public  css::lang::XTypeProvider            ,
-                            public  css::frame::XDispatchProvider       ,
-                            // baseclasses
+class DispatchProvider  :   // baseclasses
                             // Order is necessary for right initialization!
                             private ThreadHelpBase                      ,
                             private TransactionBase                     ,
-                            public  ::cppu::OWeakObject
+                            // interfaces
+                            public  ::cppu::WeakImplHelper1< css::frame::XDispatchProvider >
 {
     /* member */
     private:
@@ -100,8 +98,6 @@ class DispatchProvider  :   // interfaces
 
     /* interface */
     public:
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
 
         DispatchProvider( const css::uno::Reference< css::uno::XComponentContext >&     xContext ,
                           const css::uno::Reference< css::frame::XFrame >&              xFrame   );
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 7e47e949f4db..38a83f9ff08e 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 
 #include <tools/wldcrd.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <deque>
@@ -51,12 +51,12 @@ namespace framework{
     @attention  Don't use this class as direct member - use it dynamicly. Do not derive from this class.
                 We hold a weakreference to ouer owner not to ouer superclass.
  */
-class InterceptionHelper : public  css::frame::XDispatchProvider
-                         , public  css::frame::XDispatchProviderInterception
-                         , public  css::lang::XEventListener
-                           // order of base classes is important for right initialization of mutex member!
-                         , private ThreadHelpBase
-                         , public  ::cppu::OWeakObject
+class InterceptionHelper : // order of base classes is important for right initialization of mutex member!
+                           private ThreadHelpBase,
+                           public  ::cppu::WeakImplHelper3<
+                                     css::frame::XDispatchProvider,
+                                     css::frame::XDispatchProviderInterception,
+                                     css::lang::XEventListener >
 {
     //_____________________________________________________
     // structs, helper
@@ -195,8 +195,6 @@ class InterceptionHelper : public  css::frame::XDispatchProvider
 
     public:
 
-        FWK_DECLARE_XINTERFACE
-
         //_________________________________________________
         // XDispatchProvider
 
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index f4662f04137b..0a0bf8964a74 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -37,7 +37,8 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
+
 
 namespace framework{
 
@@ -53,15 +54,14 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class MailToDispatcher : // interfaces
-                         public  css::lang::XTypeProvider      ,
-                         public  css::lang::XServiceInfo       ,
-                         public  css::frame::XDispatchProvider ,
-                         public  css::frame::XNotifyingDispatch, // => XDispatch
-                         // baseclasses
+class MailToDispatcher : // baseclasses
                          // Order is necessary for right initialization!
                          private ThreadHelpBase                ,
-                         public  cppu::OWeakObject
+                         // interfaces
+                         public  ::cppu::WeakImplHelper3<
+                                     css::lang::XServiceInfo,
+                                     css::frame::XDispatchProvider,
+                                     css::frame::XNotifyingDispatch> // => XDispatch
 {
     /* member */
     private:
@@ -77,8 +77,6 @@ class MailToDispatcher : // interfaces
         virtual ~MailToDispatcher(                                                                     );
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XDispatchProvider
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index cc274c7e4f32..b8fbc9ba4944 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/frame/FeatureStateEvent.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
@@ -74,14 +74,13 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  OUString         ,
 
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
-class MenuDispatcher   :   // interfaces
-                                public css::lang::XTypeProvider         ,
-                                public css::frame::XDispatch            ,
-                                public css::frame::XFrameActionListener ,
-                                // baseclasses
+class MenuDispatcher   :        // baseclasses
                                 // Order is necessary for right initialization!
                                 public ThreadHelpBase                       ,
-                                public cppu::OWeakObject
+                                // interfaces
+                                public  ::cppu::WeakImplHelper2<
+                                            css::frame::XDispatch           ,
+                                            css::frame::XFrameActionListener >
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -110,13 +109,6 @@ class MenuDispatcher   :   // interfaces
                             const   css::uno::Reference< css::frame::XFrame >&              xOwner      );
 
         //---------------------------------------------------------------------------------------------------------
-        //  XInterface
-        //---------------------------------------------------------------------------------------------------------
-
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
-        //---------------------------------------------------------------------------------------------------------
         //  XDispatch
         //---------------------------------------------------------------------------------------------------------
 
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 87e95dbd617b..295f88aa9861 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -39,7 +39,8 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
+
 
 namespace framework{
 
@@ -54,15 +55,14 @@ namespace framework{
     @devstatus      ready
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class Oxt_Handler  :   // interfaces
-                        public  css::lang::XTypeProvider
-                    ,   public  css::lang::XServiceInfo
-                    ,   public  css::frame::XNotifyingDispatch // => XDispatch
-                    ,   public  css::document::XExtendedFilterDetection
-                        // baseclasses
+class Oxt_Handler  :    // baseclasses
                         // Order is necessary for right initialization!
-                    ,   private ThreadHelpBase
-                    ,   public  ::cppu::OWeakObject
+                        private ThreadHelpBase
+                        // interfaces
+                    ,   public  ::cppu::WeakImplHelper3<
+                                    css::lang::XServiceInfo,
+                                    css::frame::XNotifyingDispatch, // => XDispatch
+                                    css::document::XExtendedFilterDetection >
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -78,9 +78,7 @@ class Oxt_Handler  :   // interfaces
         //---------------------------------------------------------------------------------------------------------
         //  XInterface, XTypeProvider, XServiceInfo
         //---------------------------------------------------------------------------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-            DECLARE_XSERVICEINFO
+        DECLARE_XSERVICEINFO
 
         //---------------------------------------------------------------------------------------------------------
         //  XNotifyingDispatch
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 1a5116b92048..8402313066b0 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
@@ -76,17 +76,16 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  OUString         ,
 
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
-class PopupMenuDispatcher :   // interfaces
-                                public css::lang::XTypeProvider         ,
-                                public css::lang::XServiceInfo          ,
-                                public css::frame::XDispatchProvider    ,
-                                public css::frame::XDispatch            ,
-                                public css::frame::XFrameActionListener ,
-                                public css::lang::XInitialization       ,
-                                // baseclasses
+class PopupMenuDispatcher :     // baseclasses
                                 // Order is necessary for right initialization!
                                 public ThreadHelpBase                   ,
-                                public cppu::OWeakObject
+                                // interfaces
+                                public  ::cppu::WeakImplHelper5<
+                                           css::lang::XServiceInfo,
+                                           css::frame::XDispatchProvider,
+                                           css::frame::XDispatch,
+                                           css::frame::XFrameActionListener,
+                                           css::lang::XInitialization >
 {
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -97,8 +96,6 @@ class PopupMenuDispatcher :   // interfaces
         PopupMenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XInitialization
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index 1210a2afe86d..10e8d279a40f 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 
 namespace framework{
 
@@ -57,15 +57,14 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class ServiceHandler : // interfaces
-                       public  css::lang::XTypeProvider      ,
-                       public  css::lang::XServiceInfo       ,
-                       public  css::frame::XDispatchProvider ,
-                       public  css::frame::XNotifyingDispatch, // => XDispatch
-                       // baseclasses
+class ServiceHandler : // baseclasses
                        // Order is necessary for right initialization!
                        private ThreadHelpBase                ,
-                       public  cppu::OWeakObject
+                       // interfaces
+                       public  ::cppu::WeakImplHelper3<
+                                   css::lang::XServiceInfo       ,
+                                   css::frame::XDispatchProvider ,
+                                   css::frame::XNotifyingDispatch > // => XDispatch
 {
     /* member */
     private:
@@ -81,8 +80,6 @@ class ServiceHandler : // interfaces
         virtual ~ServiceHandler(                                                                        );
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XDispatchProvider
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 5058f3a3e522..b4f0cd144539 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
 #include <vcl/evntpost.hxx>
 
 
@@ -49,12 +49,11 @@ namespace framework{
 /**
     @short          helper to handle all URLs related to the StartModule
  */
-class StartModuleDispatcher : public css::lang::XTypeProvider
-                            , public css::frame::XNotifyingDispatch             // => XDispatch
-                            , public css::frame::XDispatchInformationProvider
-                            // baseclasses ... order is necessary for right initialization!
-                            , private ThreadHelpBase
-                            , public  ::cppu::OWeakObject
+class StartModuleDispatcher : // baseclasses ... order is necessary for right initialization!
+                              private ThreadHelpBase,
+                              public  ::cppu::WeakImplHelper2<
+                                         css::frame::XNotifyingDispatch,             // => XDispatch
+                                         css::frame::XDispatchInformationProvider >
 {
     //-------------------------------------------
     // member
@@ -113,8 +112,6 @@ class StartModuleDispatcher : public css::lang::XTypeProvider
     public:
 
         //---------------------------------------
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
 
         //---------------------------------------
         // XNotifyingDispatch
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index c343b7661a63..0f222664d2d2 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 
 namespace framework{
 
@@ -55,15 +55,14 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class SystemExec : // interfaces
-                       public  css::lang::XTypeProvider      ,
-                       public  css::lang::XServiceInfo       ,
-                       public  css::frame::XDispatchProvider ,
-                       public  css::frame::XNotifyingDispatch, // => XDispatch
-                       // baseclasses
+class SystemExec :     // baseclasses
                        // Order is necessary for right initialization!
                        private ThreadHelpBase                ,
-                       public  cppu::OWeakObject
+                       // interfaces
+                       public  ::cppu::WeakImplHelper3<
+                                   css::lang::XServiceInfo       ,
+                                   css::frame::XDispatchProvider ,
+                                   css::frame::XNotifyingDispatch > // => XDispatch
 {
     /* member */
     private:
@@ -76,11 +75,9 @@ class SystemExec : // interfaces
 
         // ctor/dtor
                  SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-        virtual ~SystemExec(                                                                        );
+        virtual ~SystemExec(                                                                     );
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XDispatchProvider
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index 8f750d3dda2d..bbf5c7948169 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -84,25 +84,6 @@ namespace framework
     }
 
 //-----------------------------------------------
-//  XInterface, XTypeProvider
-DEFINE_XINTERFACE_6(XMLBasedAcceleratorConfiguration                       ,
-                    OWeakObject                                            ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider             ),
-                    DIRECT_INTERFACE(css::ui::XAcceleratorConfiguration  ),
-                    DIRECT_INTERFACE(css::form::XReset                    ),
-                    DIRECT_INTERFACE(css::ui::XUIConfigurationPersistence),
-                    DIRECT_INTERFACE(css::ui::XUIConfigurationStorage    ),
-                    DIRECT_INTERFACE(css::ui::XUIConfiguration           ))
-
-DEFINE_XTYPEPROVIDER_6(XMLBasedAcceleratorConfiguration     ,
-                       css::lang::XTypeProvider             ,
-                       css::ui::XAcceleratorConfiguration  ,
-                       css::form::XReset                    ,
-                       css::ui::XUIConfigurationPersistence,
-                       css::ui::XUIConfigurationStorage    ,
-                       css::ui::XUIConfiguration           )
-
-//-----------------------------------------------
 XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase  (&Application::GetSolarMutex())
     , m_xContext      (xContext                     )
@@ -632,29 +613,6 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 *******************************************************************************/
 
 //-----------------------------------------------
-//  XInterface, XTypeProvider
-DEFINE_XINTERFACE_8(XCUBasedAcceleratorConfiguration                       ,
-                    OWeakObject                                            ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider             ),
-                    DIRECT_INTERFACE(css::ui::XAcceleratorConfiguration  ),
-                    DIRECT_INTERFACE(css::util::XChangesListener          ),
-                    DIRECT_INTERFACE(css::form::XReset                    ),
-                    DIRECT_INTERFACE(css::lang::XComponent                ),
-                    DIRECT_INTERFACE(css::ui::XUIConfigurationPersistence),
-                    DIRECT_INTERFACE(css::ui::XUIConfigurationStorage    ),
-                    DIRECT_INTERFACE(css::ui::XUIConfiguration           ))
-
-                    DEFINE_XTYPEPROVIDER_8(XCUBasedAcceleratorConfiguration ,
-                    css::lang::XTypeProvider             ,
-                    css::ui::XAcceleratorConfiguration  ,
-                    css::util::XChangesListener          ,
-                    css::form::XReset                    ,
-                    css::lang::XComponent                ,
-                    css::ui::XUIConfigurationPersistence,
-                    css::ui::XUIConfigurationStorage    ,
-                    css::ui::XUIConfiguration           )
-
-//-----------------------------------------------
 XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
                                 : ThreadHelpBase  (&Application::GetSolarMutex())
                                 , m_xContext      (xContext                     )
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index 2feca7985faf..b5a91da7a645 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -54,17 +54,6 @@ namespace framework
 
 //-----------------------------------------------
 // XInterface, XTypeProvider, XServiceInfo
-DEFINE_XINTERFACE_2(DocumentAcceleratorConfiguration                   ,
-                    XMLBasedAcceleratorConfiguration                           ,
-                    DIRECT_INTERFACE(css::lang::XServiceInfo)          ,
-                    DIRECT_INTERFACE(css::lang::XInitialization))
-//                    DIRECT_INTERFACE(css::ui::XUIConfigurationStorage))
-
-DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(DocumentAcceleratorConfiguration ,
-                                      XMLBasedAcceleratorConfiguration         ,
-                                      css::lang::XServiceInfo          ,
-                                      css::lang::XInitialization)
-//                                      css::ui::XUIConfigurationStorage)
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(DocumentAcceleratorConfiguration                   ,
                                    ::cppu::OWeakObject                                ,
@@ -83,7 +72,7 @@ DEFINE_INIT_SERVICE(DocumentAcceleratorConfiguration,
 
 //-----------------------------------------------
 DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
-    : XMLBasedAcceleratorConfiguration(xContext)
+    : DocumentAcceleratorConfiguration_BASE(xContext)
 {
 }
 
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 1bc6c0388d83..baabc9fe5f5d 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -43,14 +43,6 @@ namespace framework
 
 //-----------------------------------------------
 // XInterface, XTypeProvider, XServiceInfo
-DEFINE_XINTERFACE_2(GlobalAcceleratorConfiguration           ,
-                    XCUBasedAcceleratorConfiguration                 ,
-                    DIRECT_INTERFACE(css::lang::XServiceInfo),
-                    DIRECT_INTERFACE(css::lang::XInitialization))
-DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(GlobalAcceleratorConfiguration,
-                                      XCUBasedAcceleratorConfiguration      ,
-                                      css::lang::XServiceInfo       ,
-                                      css::lang::XInitialization)
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(GlobalAcceleratorConfiguration                   ,
                                    ::cppu::OWeakObject                              ,
@@ -70,7 +62,7 @@ DEFINE_INIT_SERVICE(GlobalAcceleratorConfiguration,
 
 //-----------------------------------------------
 GlobalAcceleratorConfiguration::GlobalAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
-    : XCUBasedAcceleratorConfiguration(xContext)
+    : GlobalAcceleratorConfiguration_BASE(xContext)
 {
 }
 
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 6af193dfc383..f1ee119f0b86 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -49,15 +49,6 @@ namespace framework
 
 //-----------------------------------------------
 // XInterface, XTypeProvider, XServiceInfo
-DEFINE_XINTERFACE_2(ModuleAcceleratorConfiguration              ,
-                    XCUBasedAcceleratorConfiguration                    ,
-                    DIRECT_INTERFACE(css::lang::XServiceInfo)   ,
-                    DIRECT_INTERFACE(css::lang::XInitialization))
-
-DEFINE_XTYPEPROVIDER_2_WITH_BASECLASS(ModuleAcceleratorConfiguration,
-                                      XCUBasedAcceleratorConfiguration      ,
-                                      css::lang::XServiceInfo       ,
-                                      css::lang::XInitialization    )
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(ModuleAcceleratorConfiguration                   ,
                                    ::cppu::OWeakObject                              ,
@@ -76,7 +67,7 @@ DEFINE_INIT_SERVICE(ModuleAcceleratorConfiguration,
 
 //-----------------------------------------------
 ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
-    : XCUBasedAcceleratorConfiguration(xContext)
+    : ModuleAcceleratorConfiguration_BASE(xContext)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration" );
 }
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 6a87dfb11c26..01d34bd52a79 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -57,26 +57,11 @@ const char URL_CLOSEWIN[] = ".uno:CloseWin";
 const char URL_CLOSEFRAME[] = ".uno:CloseFrame";
 
 
-DEFINE_XINTERFACE_4(CloseDispatcher                                           ,
-                    OWeakObject                                               ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider                ),
-                    DIRECT_INTERFACE(css::frame::XNotifyingDispatch          ),
-                    DIRECT_INTERFACE(css::frame::XDispatch                   ),
-                    DIRECT_INTERFACE(css::frame::XDispatchInformationProvider))
-
-// Note: XStatusListener is an implementation detail. Hide it for scripting!
-DEFINE_XTYPEPROVIDER_4(CloseDispatcher                         ,
-                       css::lang::XTypeProvider                ,
-                       css::frame::XDispatchInformationProvider,
-                       css::frame::XNotifyingDispatch          ,
-                       css::frame::XDispatch                   )
-
 //-----------------------------------------------
 CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
                                  const css::uno::Reference< css::frame::XFrame >&          xFrame ,
                                  const OUString&                                           sTarget)
     : ThreadHelpBase     (&Application::GetSolarMutex()                   )
-    , ::cppu::OWeakObject(                                                )
     , m_xContext         (rxContext                                       )
     , m_aAsyncCallback   (LINK( this, CloseDispatcher, impl_asyncCallback))
     , m_lStatusListener  (m_aLock.getShareableOslMutex()                  )
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index 936a9139a416..fc16cbac3cee 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -32,10 +32,6 @@
 
 namespace framework{
 
-DEFINE_XINTERFACE_1(DispatchInformationProvider                               ,
-                    OWeakObject                                               ,
-                    DIRECT_INTERFACE(css::frame::XDispatchInformationProvider))
-
 //_________________________________________________________________________________________________________________
 DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext ,
                                                          const css::uno::Reference< css::frame::XFrame >&          xFrame)
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 683843acc2f8..b10ed338815e 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -49,20 +49,6 @@
 
 namespace framework{
 
-//*****************************************************************************************************************
-//  XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_2( DispatchProvider                               ,
-                     OWeakObject                                    ,
-                     DIRECT_INTERFACE(css::lang::XTypeProvider     ),
-                     DIRECT_INTERFACE(css::frame::XDispatchProvider)
-                   )
-
-DEFINE_XTYPEPROVIDER_2( DispatchProvider             ,
-                        css::lang::XTypeProvider     ,
-                        css::frame::XDispatchProvider
-                      )
-
 /**
     @short      standard ctor/dtor
     @descr      These initialize a new instance of this class with needed information for work.
@@ -81,7 +67,6 @@ DispatchProvider::DispatchProvider( const css::uno::Reference< css::uno::XCompon
                                     const css::uno::Reference< css::frame::XFrame >&              xFrame    )
         //  Init baseclasses first
         : ThreadHelpBase( &Application::GetSolarMutex() )
-        , OWeakObject   (                               )
         // Init member
         , m_xContext    ( rxContext                     )
         , m_xFrame      ( xFrame                        )
diff --git a/framework/source/dispatch/interceptionhelper.cxx b/framework/source/dispatch/interceptionhelper.cxx
index eedfcabf26ad..a46a60e84f60 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -31,17 +31,10 @@ sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor = sal_True;
 
 
 
-DEFINE_XINTERFACE_3(InterceptionHelper                                         ,
-                    OWeakObject                                                ,
-                    DIRECT_INTERFACE(css::frame::XDispatchProvider            ),
-                    DIRECT_INTERFACE(css::frame::XDispatchProviderInterception),
-                    DIRECT_INTERFACE(css::lang::XEventListener                ))
-
 InterceptionHelper::InterceptionHelper(const css::uno::Reference< css::frame::XFrame >&            xOwner,
                                        const css::uno::Reference< css::frame::XDispatchProvider >& xSlave)
     //  Init baseclasses first
     : ThreadHelpBase(&Application::GetSolarMutex())
-    , OWeakObject   (                             )
     // Init member
     , m_xOwnerWeak  (xOwner                       )
     , m_xSlave      (xSlave                       )
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 2aed843aa7e8..e26385a1584f 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -33,21 +33,6 @@ namespace framework{
 //_________________________________________________________________________________________________________________
 // XInterface, XTypeProvider, XServiceInfo
 
-DEFINE_XINTERFACE_5(MailToDispatcher                                ,
-                    OWeakObject                                     ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider      ),
-                    DIRECT_INTERFACE(css::lang::XServiceInfo       ),
-                    DIRECT_INTERFACE(css::frame::XDispatchProvider ),
-                    DIRECT_INTERFACE(css::frame::XNotifyingDispatch),
-                    DIRECT_INTERFACE(css::frame::XDispatch         ))
-
-DEFINE_XTYPEPROVIDER_5(MailToDispatcher              ,
-                       css::lang::XTypeProvider      ,
-                       css::lang::XServiceInfo       ,
-                       css::frame::XDispatchProvider ,
-                       css::frame::XNotifyingDispatch,
-                       css::frame::XDispatch         )
-
 DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher                   ,
                                  ::cppu::OWeakObject                ,
                                  SERVICENAME_PROTOCOLHANDLER        ,
@@ -75,7 +60,6 @@ DEFINE_INIT_SERVICE(MailToDispatcher,
 MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
         //  Init baseclasses first
         : ThreadHelpBase( &Application::GetSolarMutex() )
-        , OWeakObject   (                               )
         // Init member
         , m_xContext    ( rxContext                     )
 {
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 1c00f2bc7b08..8976610e3f2c 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -95,7 +95,6 @@ MenuDispatcher::MenuDispatcher(   const   uno::Reference< XComponentContext >&
                                   const   uno::Reference< XFrame >&             xOwner      )
         //  Init baseclasses first
         :   ThreadHelpBase          ( &Application::GetSolarMutex()  )
-        ,   OWeakObject             (                                )
         // Init member
         ,   m_xOwnerWeak            ( xOwner                         )
         ,   m_xContext              ( xContext                       )
@@ -123,25 +122,6 @@ MenuDispatcher::~MenuDispatcher()
 }
 
 //*****************************************************************************************************************
-//  XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_4     (   MenuDispatcher                     ,
-                            OWeakObject                         ,
-                            DIRECT_INTERFACE(   XTypeProvider   ),
-                            DIRECT_INTERFACE(   XDispatch       ),
-                            DIRECT_INTERFACE(   XEventListener  ),
-                            DERIVED_INTERFACE(  XFrameActionListener, XEventListener )
-                        )
-
-DEFINE_XTYPEPROVIDER_4  (   MenuDispatcher     ,
-                            XTypeProvider       ,
-                            XDispatch           ,
-                            XEventListener      ,
-                            XFrameActionListener
-                        )
-
-
-//*****************************************************************************************************************
 //  XDispatch
 //*****************************************************************************************************************
 void SAL_CALL MenuDispatcher::dispatch(    const   URL&                        /*aURL*/            ,
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index ffc75e89a7f8..7efea865ac75 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -37,22 +37,6 @@ namespace framework{
 //*****************************************************************************************************************
 //  XInterface, XTypeProvider, XServiceInfo
 //*****************************************************************************************************************
-DEFINE_XINTERFACE_5                 (   Oxt_Handler                                                ,
-                                        OWeakObject                                                ,
-                                        DIRECT_INTERFACE( css::lang::XTypeProvider                ),
-                                        DIRECT_INTERFACE( css::lang::XServiceInfo                 ),
-                                        DIRECT_INTERFACE( css::frame::XNotifyingDispatch          ),
-                                        DIRECT_INTERFACE( css::frame::XDispatch                   ),
-                                        DIRECT_INTERFACE( css::document::XExtendedFilterDetection )
-                                    )
-
-DEFINE_XTYPEPROVIDER_5              (   Oxt_Handler                                                ,
-                                        css::lang::XTypeProvider                                   ,
-                                        css::lang::XServiceInfo                                    ,
-                                        css::frame::XNotifyingDispatch                             ,
-                                        css::frame::XDispatch                                      ,
-                                        css::document::XExtendedFilterDetection
-                                    )
 
 DEFINE_XSERVICEINFO_MULTISERVICE    (   Oxt_Handler                                                ,
                                         ::cppu::OWeakObject                                        ,
@@ -80,7 +64,6 @@ DEFINE_INIT_SERVICE                 (   Oxt_Handler,
 Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
         //  Init baseclasses first
         :   ThreadHelpBase      (          )
-        ,   ::cppu::OWeakObject (          )
         // Init member
         ,   m_xFactory          ( xFactory )
 {
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index 5fffa7066cc2..da1ed782bd4e 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -61,7 +61,6 @@ PopupMenuDispatcher::PopupMenuDispatcher(
     const uno::Reference< XComponentContext >& xContext )
         //  Init baseclasses first
         :   ThreadHelpBase          ( &Application::GetSolarMutex()  )
-        ,   OWeakObject             (                                )
         // Init member
         ,   m_xContext              ( xContext                       )
         ,   m_aListenerContainer    ( m_aLock.getShareableOslMutex() )
@@ -80,30 +79,6 @@ PopupMenuDispatcher::~PopupMenuDispatcher()
     // and a dtor isn't the best place to do that!
 }
 
-//*****************************************************************************************************************
-//  XInterface, XTypeProvider
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_7     ( PopupMenuDispatcher                                     ,
-                          ::cppu::OWeakObject                                     ,
-                          DIRECT_INTERFACE( XTypeProvider                         ),
-                          DIRECT_INTERFACE( XServiceInfo                          ),
-                          DIRECT_INTERFACE( XDispatchProvider                     ),
-                          DIRECT_INTERFACE( XDispatch                             ),
-                          DIRECT_INTERFACE( XEventListener                        ),
-                          DIRECT_INTERFACE( XInitialization                       ),
-                          DERIVED_INTERFACE( XFrameActionListener, XEventListener )
-                        )
-
-DEFINE_XTYPEPROVIDER_7  (   PopupMenuDispatcher ,
-                            XTypeProvider       ,
-                            XServiceInfo        ,
-                            XDispatchProvider   ,
-                            XDispatch           ,
-                            XEventListener      ,
-                            XInitialization     ,
-                            XFrameActionListener
-                        )
-
 OUString SAL_CALL PopupMenuDispatcher::getImplementationName() throw( css::uno::RuntimeException )
 {
     return impl_getStaticImplementationName();
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index e67370b184e2..240d913a5ac4 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -35,21 +35,6 @@ namespace framework{
 //_________________________________________________________________________________________________________________
 // XInterface, XTypeProvider, XServiceInfo
 
-DEFINE_XINTERFACE_5(ServiceHandler                                  ,
-                    OWeakObject                                     ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider      ),
-                    DIRECT_INTERFACE(css::lang::XServiceInfo       ),
-                    DIRECT_INTERFACE(css::frame::XDispatchProvider ),
-                    DIRECT_INTERFACE(css::frame::XNotifyingDispatch),
-                    DIRECT_INTERFACE(css::frame::XDispatch         ))
-
-DEFINE_XTYPEPROVIDER_5(ServiceHandler                ,
-                       css::lang::XTypeProvider      ,
-                       css::lang::XServiceInfo       ,
-                       css::frame::XDispatchProvider ,
-                       css::frame::XNotifyingDispatch,
-                       css::frame::XDispatch         )
-
 DEFINE_XSERVICEINFO_MULTISERVICE(ServiceHandler                   ,
                                  ::cppu::OWeakObject              ,
                                  SERVICENAME_PROTOCOLHANDLER      ,
@@ -77,7 +62,6 @@ DEFINE_INIT_SERVICE(ServiceHandler,
 ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory )
         //  Init baseclasses first
         : ThreadHelpBase( &Application::GetSolarMutex() )
-        , OWeakObject   (                               )
         // Init member
         , m_xFactory    ( xFactory                      )
 {
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 56f87f8d498c..1c9e51185bd1 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -53,26 +53,11 @@ namespace framework{
 namespace fpf = ::framework::pattern::frame;
 
 
-DEFINE_XINTERFACE_4(StartModuleDispatcher                                     ,
-                    OWeakObject                                               ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider                ),
-                    DIRECT_INTERFACE(css::frame::XNotifyingDispatch          ),
-                    DIRECT_INTERFACE(css::frame::XDispatch                   ),
-                    DIRECT_INTERFACE(css::frame::XDispatchInformationProvider))
-
-// Note: XStatusListener is an implementation detail. Hide it for scripting!
-DEFINE_XTYPEPROVIDER_4(StartModuleDispatcher                   ,
-                       css::lang::XTypeProvider                ,
-                       css::frame::XDispatchInformationProvider,
-                       css::frame::XNotifyingDispatch          ,
-                       css::frame::XDispatch                   )
-
 //-----------------------------------------------
 StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >&     rxContext,
                                              const css::uno::Reference< css::frame::XFrame >&              xFrame ,
                                              const OUString&                                        sTarget)
     : ThreadHelpBase     (&Application::GetSolarMutex() )
-    , ::cppu::OWeakObject(                              )
     , m_xContext         (rxContext                         )
     , m_xOwner           (xFrame                        )
     , m_sDispatchTarget  (sTarget                       )
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 94719d2fbc77..717011ca8dde 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -39,21 +39,6 @@ namespace framework{
 //_________________________________________________________________________________________________________________
 // XInterface, XTypeProvider, XServiceInfo
 
-DEFINE_XINTERFACE_5(SystemExec                                      ,
-                    OWeakObject                                     ,
-                    DIRECT_INTERFACE(css::lang::XTypeProvider      ),
-                    DIRECT_INTERFACE(css::lang::XServiceInfo       ),
-                    DIRECT_INTERFACE(css::frame::XDispatchProvider ),
-                    DIRECT_INTERFACE(css::frame::XNotifyingDispatch),
-                    DIRECT_INTERFACE(css::frame::XDispatch         ))
-
-DEFINE_XTYPEPROVIDER_5(SystemExec                    ,
-                       css::lang::XTypeProvider      ,
-                       css::lang::XServiceInfo       ,
-                       css::frame::XDispatchProvider ,
-                       css::frame::XNotifyingDispatch,
-                       css::frame::XDispatch         )
-
 DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec                   ,
                                  ::cppu::OWeakObject          ,
                                  SERVICENAME_PROTOCOLHANDLER  ,
@@ -74,7 +59,6 @@ DEFINE_INIT_SERVICE(SystemExec,
 SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
         //  Init baseclasses first
         : ThreadHelpBase( &Application::GetSolarMutex() )
-        , OWeakObject   (                               )
         // Init member
         , m_xContext    ( rxContext                     )
 {
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index ff30b448d57b..6f3e055ee6e3 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -47,7 +47,8 @@
 #include <com/sun/star/form/XReset.hpp>
 
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <salhelper/singletonref.hxx>
 
 //__________________________________________
@@ -68,14 +69,13 @@ typedef PresetHandler AcceleratorPresets;
 /**
     implements a read/write access to the accelerator configuration.
  */
-class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase                       // attention! Must be the first base class to guarentee right initialize lock ...
-                                       , public    IStorageListener
-                                       , public    ::cppu::OWeakObject
-                                       , public    css::lang::XTypeProvider
-                                       , public    css::form::XReset                    // TODO use XPresetHandler instead if available
-                                       , public    css::ui::XAcceleratorConfiguration  // => css::ui::XUIConfigurationPersistence
-                                                                                       //    css::ui::XUIConfigurationStorage
-                                                                                       //    css::ui::XUIConfiguration
+class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,                            // attention! Must be the first base class to guarentee right initialize lock ...
+                                         public    IStorageListener,
+                                         public    ::cppu::WeakImplHelper2<
+                                                       css::form::XReset,                    // TODO use XPresetHandler instead if available
+                                                       css::ui::XAcceleratorConfiguration >  // => css::ui::XUIConfigurationPersistence
+                                                                                             //    css::ui::XUIConfigurationStorage
+                                                                                             //    css::ui::XUIConfiguration
 {
     //______________________________________
     // member
@@ -116,10 +116,6 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
 
     public:
 
-        // XInterface, XTypeProvider
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
         // XAcceleratorConfiguration
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
             throw(css::uno::RuntimeException);
@@ -286,15 +282,14 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase
 
 };
 
-class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase                       // attention! Must be the first base class to guarentee right initialize lock ...
-                                       , public    ::cppu::OWeakObject
-                                       , public    css::lang::XTypeProvider
-                                       , public    css::util::XChangesListener
-                                       , public    css::lang::XComponent
-                                       , public    css::form::XReset                    // TODO use XPresetHandler instead if available
-                                       , public    css::ui::XAcceleratorConfiguration  // => css::ui::XUIConfigurationPersistence
-                                                                                       //    css::ui::XUIConfigurationStorage
-                                                                                       //    css::ui::XUIConfiguration
+class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,                       // attention! Must be the first base class to guarentee right initialize lock ...
+                                         public  ::cppu::WeakImplHelper4<
+                                                     css::util::XChangesListener,
+                                                     css::lang::XComponent,
+                                                     css::form::XReset,                    // TODO use XPresetHandler instead if available
+                                                     css::ui::XAcceleratorConfiguration >  // => css::ui::XUIConfigurationPersistence
+                                                                                           //    css::ui::XUIConfigurationStorage
+                                                                                           //    css::ui::XUIConfiguration
 {
     //______________________________________
     // member
@@ -330,10 +325,6 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase
 
     public:
 
-        // XInterface, XTypeProvider
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
         // XAcceleratorConfiguration
         virtual css::uno::Sequence< css::awt::KeyEvent > SAL_CALL getAllKeyEvents()
             throw(css::uno::RuntimeException);
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index d6283f0adb94..ce1416f0a154 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/XUIConfigurationStorage.hpp>
 
+#include <cppuhelper/implbase2.hxx>
 // definition
 
 namespace framework
@@ -41,10 +42,13 @@ namespace framework
     implements a read/write access to a document
     based accelerator configuration.
  */
-class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration
-                                       , public css::lang::XServiceInfo
-                                       , public css::lang::XInitialization
-//                                       , public css::ui::XUIConfigurationStorage
+
+typedef ::cppu::ImplInheritanceHelper2<
+             XMLBasedAcceleratorConfiguration,
+             css::lang::XServiceInfo,
+             css::lang::XInitialization > DocumentAcceleratorConfiguration_BASE;
+
+class DocumentAcceleratorConfiguration : public DocumentAcceleratorConfiguration_BASE
 {
     //______________________________________
     // member
@@ -71,8 +75,6 @@ class DocumentAcceleratorConfiguration : public XMLBasedAcceleratorConfiguration
         virtual ~DocumentAcceleratorConfiguration();
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XInitialization
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index 3f8a6c6b00e8..df2e0fbfb8de 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -39,9 +39,11 @@ namespace framework
     implements a read/write access to the global
     accelerator configuration.
  */
-class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
-                                     , public css::lang::XServiceInfo
-                                     , public css::lang::XInitialization
+typedef ::cppu::ImplInheritanceHelper2<
+             XCUBasedAcceleratorConfiguration,
+             css::lang::XServiceInfo,
+             css::lang::XInitialization > GlobalAcceleratorConfiguration_BASE;
+class GlobalAcceleratorConfiguration : GlobalAcceleratorConfiguration_BASE
 {
     //______________________________________
     // interface
@@ -61,8 +63,6 @@ class GlobalAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
         virtual ~GlobalAcceleratorConfiguration();
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XInitialization
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index 816d2d8c8d89..aebba355e4ff 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -28,6 +28,7 @@
 #include <macros/xserviceinfo.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <cppuhelper/implbase2.hxx>
 
 // definition
 
@@ -39,9 +40,12 @@ namespace framework
     implements a read/write access to a module
     dependend accelerator configuration.
  */
-class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
-                                     , public css::lang::XServiceInfo
-                                     , public css::lang::XInitialization
+typedef ::cppu::ImplInheritanceHelper2<
+            XCUBasedAcceleratorConfiguration,
+            css::lang::XServiceInfo,
+            css::lang::XInitialization > ModuleAcceleratorConfiguration_BASE;
+
+class ModuleAcceleratorConfiguration : ModuleAcceleratorConfiguration_BASE
 {
     //______________________________________
     // member
@@ -72,8 +76,6 @@ class ModuleAcceleratorConfiguration : public XCUBasedAcceleratorConfiguration
         virtual ~ModuleAcceleratorConfiguration();
 
         // XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
         // XInitialization