From 7af63ddd93265f6d66aeaa103ba0c5810ea1b158 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 23 Jan 2023 15:58:18 +0100
Subject: Use ImplInheritanceHelper in AccessibleListBox

Change-Id: I7fd3c43a991300a6180094ef9ac44e0dc3c56764
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146112
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 accessibility/inc/extended/accessiblelistbox.hxx    | 14 ++++----------
 accessibility/source/extended/accessiblelistbox.cxx |  4 +---
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx
index 339e32f3b0b7..ffb03ad6bd9f 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/vclevent.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 
@@ -38,10 +38,10 @@ namespace accessibility
     /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
     */
     class AccessibleListBox :
-        public cppu::ImplHelper2<
+        public cppu::ImplInheritanceHelper<
+            VCLXAccessibleComponent,
             css::accessibility::XAccessible,
-            css::accessibility::XAccessibleSelection>,
-        public VCLXAccessibleComponent
+            css::accessibility::XAccessibleSelection>
     {
 
         css::uno::Reference< css::accessibility::XAccessible > m_xParent;
@@ -76,12 +76,6 @@ namespace accessibility
 
         rtl::Reference<AccessibleListBoxEntry> implGetAccessible(SvTreeListEntry & rEntry);
 
-        // XTypeProvider
-        DECLARE_XTYPEPROVIDER()
-
-        // XInterface
-        DECLARE_XINTERFACE()
-
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx
index d9507fefd4b3..5561fa232dfc 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -45,7 +45,7 @@ namespace accessibility
 
     AccessibleListBox::AccessibleListBox( SvTreeListBox const & _rListBox, const Reference< XAccessible >& _xParent ) :
 
-        VCLXAccessibleComponent( _rListBox.GetWindowPeer() ),
+        ImplInheritanceHelper( _rListBox.GetWindowPeer() ),
         m_xParent( _xParent )
     {
     }
@@ -59,8 +59,6 @@ namespace accessibility
             dispose();
         }
     }
-    IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, ImplHelper2)
-    IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, ImplHelper2)
 
     void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
-- 
cgit