Use ImplInheritanceHelper in AccessibleTabBarPageList

Change-Id: I1f03912046d94bd0e14f65310d93ec4f539fa304
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146115
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 7 insertions, 27 deletions

diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 2c7bc2fced93..858a475d7669 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <extended/accessibletabbarbase.hxx>
 
 #include <vector>
@@ -34,13 +34,11 @@ namespace accessibility
 
 
 
-    typedef ::cppu::ImplHelper3<
-        css::accessibility::XAccessible,
-        css::accessibility::XAccessibleSelection,
-        css::lang::XServiceInfo > AccessibleTabBarPageList_BASE;
-
-    class AccessibleTabBarPageList final : public AccessibleTabBarBase,
-                                           public AccessibleTabBarPageList_BASE
+    class AccessibleTabBarPageList final : public cppu::ImplInheritanceHelper<
+                                               AccessibleTabBarBase,
+                                               css::accessibility::XAccessible,
+                                               css::accessibility::XAccessibleSelection,
+                                               css::lang::XServiceInfo>
     {
     private:
         typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > AccessibleChildren;
@@ -68,12 +66,6 @@ namespace accessibility
     public:
         AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent );
 
-        // XInterface
-        DECLARE_XINTERFACE()
-
-        // XTypeProvider
-        DECLARE_XTYPEPROVIDER()
-
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
         virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx
index f09d43fd23db..3eb8ab324c37 100644
--- a/accessibility/source/extended/accessibletabbarpagelist.cxx
+++ b/accessibility/source/extended/accessibletabbarpagelist.cxx
@@ -48,7 +48,7 @@ namespace accessibility
 
 
     AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent )
-        :AccessibleTabBarBase( pTabBar )
+        :ImplInheritanceHelper( pTabBar )
         ,m_nIndexInParent( nIndexInParent )
     {
         if ( m_pTabBar )
@@ -326,18 +326,6 @@ namespace accessibility
     }
 
 
-    // XInterface
-
-
-    IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
-
-
-    // XTypeProvider
-
-
-    IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, OAccessibleExtendedComponentHelper, AccessibleTabBarPageList_BASE )
-
-
     // XComponent