Convert framework::StatusBarManager to WeakImplHelper

Change-Id: I25cc72536d8832d93d6832591bdba25ac0654ee3

framework/inc/uielement/statusbarmanager.hxx

@@ -35,7 +35,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/weak.hxx>
+#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <vcl/status.hxx>
 #include <map>
@@ -44,12 +44,12 @@ namespace framework
 {
 
 class FrameworkStatusBar;
-class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener         ,
-                         public ::com::sun::star::lang::XComponent                    ,
-                         public ::com::sun::star::lang::XTypeProvider                 ,
-                         public ::com::sun::star::ui::XUIConfigurationListener,
-                         public ThreadHelpBase                                        ,
-                         public ::cppu::OWeakObject
+class StatusBarManager : public ThreadHelpBase,
+                         public ::cppu::WeakImplHelper3<
+                                   css::frame::XFrameActionListener,
+                                   css::lang::XComponent,
+                                   css::ui::XUIConfigurationListener >
+
 {
     friend class FrameworkStatusBar;
 
@@ -60,10 +60,6 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
                           StatusBar* pStatusBar );
         virtual ~StatusBarManager();
 
-        //  XInterface, XTypeProvider, XServiceInfo
-        FWK_DECLARE_XINTERFACE
-        FWK_DECLARE_XTYPEPROVIDER
-
         StatusBar* GetStatusBar() const;
 
         // XFrameActionListener

framework/source/uielement/statusbarmanager.cxx

@@ -130,25 +130,6 @@ static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle )
 }
 
 }
-//*****************************************************************************************************************
-//  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
-DEFINE_XINTERFACE_5                     (   StatusBarManager                                                        ,
-                                            ::cppu::OWeakObject                                                     ,
-                                            DIRECT_INTERFACE( lang::XTypeProvider                                   ),
-                                            DIRECT_INTERFACE( lang::XComponent                                      ),
-                                            DIRECT_INTERFACE( frame::XFrameActionListener                           ),
-                                            DIRECT_INTERFACE( css::ui::XUIConfigurationListener                    ),
-                                            DERIVED_INTERFACE( lang::XEventListener, frame::XFrameActionListener    )
-                                        )
-
-DEFINE_XTYPEPROVIDER_5                  (   StatusBarManager                    ,
-                                            lang::XTypeProvider                 ,
-                                            lang::XComponent                    ,
-                                            css::ui::XUIConfigurationListener  ,
-                                            frame::XFrameActionListener         ,
-                                            lang::XEventListener
-                                        )
 
 StatusBarManager::StatusBarManager(
     const uno::Reference< uno::XComponentContext >& rxContext,
@@ -156,7 +137,6 @@ StatusBarManager::StatusBarManager(
     const OUString& rResourceName,
     StatusBar* pStatusBar ) :
     ThreadHelpBase( &Application::GetSolarMutex() ),
-    OWeakObject(),
     m_bDisposed( sal_False ),
     m_bFrameActionRegistered( sal_False ),
     m_bUpdateControllers( sal_False ),