convert more services in framework module to WeakImplHelper

Change-Id: I417ae2ce644f39fce0e8eb9fbe6a3a3c783b6227

4 files changed, 3 insertions, 73 deletions

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" );
 }