From c2f14c9a0aa07c36446ea308b9192248e4c6213d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 27 Jan 2023 15:48:15 +0100
Subject: Use ImplInheritanceHelper in SvxShowCharSetItemAcc

Change-Id: I0baaac510afcbae5a8a9fa5886daa8b4f83145e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146280
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 svx/source/accessibility/charmapacc.cxx |  3 ---
 svx/source/inc/charmapacc.hxx           | 15 ++++-----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 89e0b62199dc..d6c8b4b49216 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -379,9 +379,6 @@ SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc()
     ensureDisposed();
 }
 
-IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_3 )
-
 void SvxShowCharSetItemAcc::ParentDestroyed()
 {
     const ::osl::MutexGuard aGuard( GetMutex() );
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 339192ced108..2183e1d7a52a 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
 #include <tools/gen.hxx>
 #include <rtl/ref.hxx>
 
@@ -149,14 +148,12 @@ namespace svx
 
     // - SvxShowCharSetItemAcc -
 
-    typedef ::cppu::ImplHelper2 <   css::accessibility::XAccessible,
-                                    css::accessibility::XAccessibleAction
-                                >   OAccessibleHelper_Base_3;
-
     /** The child implementation of the table.
     */
-    class SvxShowCharSetItemAcc final : public ::comphelper::OAccessibleComponentHelper,
-                                  public OAccessibleHelper_Base_3
+    class SvxShowCharSetItemAcc final : public cppu::ImplInheritanceHelper<
+                                            ::comphelper::OAccessibleComponentHelper,
+                                            css::accessibility::XAccessible,
+                                            css::accessibility::XAccessibleAction>
     {
     private:
         SvxShowCharSetItem* mpParent;
@@ -168,10 +165,6 @@ namespace svx
         virtual css::awt::Rectangle implGetBounds(  ) override;
     public:
 
-        // XInterface
-        DECLARE_XINTERFACE( )
-        DECLARE_XTYPEPROVIDER( )
-
         SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent );
 
         void    ParentDestroyed();
-- 
cgit