From c1b17b0e9191901e8110ef14acce86c810a11491 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 26 Jan 2023 17:29:14 +0100
Subject: [PATCH] Use ImplInheritanceHelper in VCLXAccessibleScrollBar

Change-Id: I8702abb22d14eb88655a1a133ecce8140b0cd4e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146235
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 .../inc/standard/vclxaccessiblescrollbar.hxx  | 20 ++++++-------------
 .../standard/vclxaccessiblescrollbar.cxx      | 12 -----------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
index 4476ed7c89a1..ffaa7f689a78 100644
--- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx
@@ -24,17 +24,15 @@
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
 
-typedef ::cppu::ImplHelper2<
-    css::accessibility::XAccessibleAction,
-    css::accessibility::XAccessibleValue > VCLXAccessibleScrollBar_BASE;
-
-class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent,
-                                public VCLXAccessibleScrollBar_BASE
+class VCLXAccessibleScrollBar final : public cppu::ImplInheritanceHelper<
+                                          VCLXAccessibleComponent,
+                                          css::accessibility::XAccessibleAction,
+                                          css::accessibility::XAccessibleValue>
 {
     virtual ~VCLXAccessibleScrollBar() override = default;
 
@@ -42,13 +40,7 @@ class VCLXAccessibleScrollBar final : public VCLXAccessibleComponent,
     virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
-    using VCLXAccessibleComponent::VCLXAccessibleComponent;
-
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
+    VCLXAccessibleScrollBar( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {}
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 8b001ea0f232..4ea6f788bb3c 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -76,18 +76,6 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet( sal_Int64& rStateSet )
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE )
-
-
 // XServiceInfo