From 969b3f1e5416bfbec8d8bf2871a8176393ddaa22 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 26 Jan 2023 17:22:50 +0100
Subject: Use ImplInheritanceHelper in VCLXAccessibleMenuItem

Change-Id: I0eca36225c2a43e2ba90253c013fefe43b2f29a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146232
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 .../inc/standard/vclxaccessiblemenuitem.hxx        | 22 +++++++---------------
 .../source/standard/vclxaccessiblemenuitem.cxx     | 14 +-------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
index e67be7f09e53..ddc50a8f3577 100644
--- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx
@@ -25,20 +25,18 @@
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 
 
 
 
-typedef ::cppu::ImplHelper3<
-    css::accessibility::XAccessibleText,
-    css::accessibility::XAccessibleAction,
-    css::accessibility::XAccessibleValue > VCLXAccessibleMenuItem_BASE;
-
-class VCLXAccessibleMenuItem :  public OAccessibleMenuItemComponent,
-                                public ::comphelper::OCommonAccessibleText,
-                                public VCLXAccessibleMenuItem_BASE
+class VCLXAccessibleMenuItem :  public cppu::ImplInheritanceHelper<
+                                    OAccessibleMenuItemComponent,
+                                    css::accessibility::XAccessibleText,
+                                    css::accessibility::XAccessibleAction,
+                                    css::accessibility::XAccessibleValue>,
+                                public ::comphelper::OCommonAccessibleText
 {
 protected:
     virtual bool            IsFocused() override;
@@ -57,12 +55,6 @@ protected:
 public:
     VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu = nullptr );
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index 307b1246b873..2c4e8043c00b 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -50,7 +50,7 @@ using namespace ::comphelper;
 
 
 VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu )
-    :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu )
+    :ImplInheritanceHelper( pParent, nItemPos, pMenu )
 {
 }
 
@@ -134,18 +134,6 @@ void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE )
-
-
 // XServiceInfo
 
 
-- 
cgit