From 148caa36121ddc37b18226308cec0e7f535477de Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 26 Jan 2023 17:40:18 +0100
Subject: [PATCH] Use ImplInheritanceHelper in VCLXAccessibleTextField

Change-Id: Ie6b9fd7d825940d090f76b23597c40d8cbbca7c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 .../inc/standard/vclxaccessibletextfield.hxx       | 14 ++------------
 .../source/standard/vclxaccessibletextfield.cxx    |  5 +----
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx
index f99b6c0296f6..b730bd107ea2 100644
--- a/accessibility/inc/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx
@@ -21,10 +21,7 @@
 
 #include <standard/vclxaccessibletextcomponent.hxx>
 
-#include <cppuhelper/implbase1.hxx>
-
-typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BASE;
-
+#include <cppuhelper/implbase.hxx>
 
 /** This class represents non editable text fields.  The object passed to
     the constructor is expected to be a list (a ListBox to be
@@ -33,19 +30,12 @@ typedef ::cppu::ImplHelper1< css::accessibility::XAccessible > VCLXAccessible_BA
     exported text changes.
 */
 class VCLXAccessibleTextField final :
-    public VCLXAccessibleTextComponent,
-    public VCLXAccessible_BASE
+    public cppu::ImplInheritanceHelper<VCLXAccessibleTextComponent, css::accessibility::XAccessible>
 {
 public:
     VCLXAccessibleTextField (VCLXWindow* pVCLXindow,
                              const css::uno::Reference< css::accessibility::XAccessible >& _xParent);
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
-
     // XAccessible
     css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL
         getAccessibleContext() override;
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
index dd5f542f2fc7..e5121affd7ce 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::accessibility;
 
 
 VCLXAccessibleTextField::VCLXAccessibleTextField (VCLXWindow* pVCLWindow, const Reference< XAccessible >& _xParent) :
-    VCLXAccessibleTextComponent (pVCLWindow),
+    ImplInheritanceHelper (pVCLWindow),
     m_xParent( _xParent )
 
 {
@@ -48,9 +48,6 @@ OUString VCLXAccessibleTextField::implGetText()
     return aText;
 }
 
-IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleTextField, VCLXAccessibleTextComponent, VCLXAccessible_BASE)
-IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComponent, VCLXAccessible_BASE)
-
 
 // XAccessible