Use ImplInheritanceHelper in AccessibleIconChoiceCtrl

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

2 files changed, 8 insertions, 18 deletions

diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index cd27fcb7da3f..5ead84ee3466 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.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>
 
@@ -30,13 +30,13 @@ class SvtIconChoiceCtrl;
 
 namespace accessibility
 {
-    typedef ::cppu::ImplHelper2<  css::accessibility::XAccessible
-                                , css::accessibility::XAccessibleSelection> AccessibleIconChoiceCtrl_BASE;
-
     /** the class OAccessibleListBoxEntry represents the base class for an accessible object of a listbox entry
     */
-    class AccessibleIconChoiceCtrl final : public AccessibleIconChoiceCtrl_BASE
-                                          ,public VCLXAccessibleComponent
+    class AccessibleIconChoiceCtrl final :
+        public cppu::ImplInheritanceHelper<
+            VCLXAccessibleComponent,
+            css::accessibility::XAccessible,
+            css::accessibility::XAccessibleSelection>
     {
         css::uno::Reference< css::accessibility::XAccessible > m_xParent;
 
@@ -60,12 +60,6 @@ namespace accessibility
         AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl,
                                   const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
 
-        // 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/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index 18835b50b95d..1d0dbbe68a7d 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -43,14 +43,11 @@ namespace accessibility
     // Ctor() and Dtor()
 
     AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl const & _rIconCtrl, const Reference< XAccessible >& _xParent ) :
-        VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ),
+        ImplInheritanceHelper( _rIconCtrl.GetWindowPeer() ),
         m_xParent       ( _xParent )
     {
     }
 
-    IMPLEMENT_FORWARD_XINTERFACE2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
-    IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE)
-
     void AccessibleIconChoiceCtrl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     {
         if ( !isAlive() )
@@ -167,8 +164,7 @@ namespace accessibility
         if ( !pEntry )
             throw RuntimeException("getAccessibleChild: Entry "
                                    + OUString::number(i) + " not found",
-                static_cast<css::lang::XTypeProvider*>(
-                    static_cast<VCLXAccessibleComponent*>(this)));
+                static_cast<OWeakObject*>(this));
 
         return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this );
     }