Use ImplInheritanceHelper in AccessibleDialogControlShape

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

2 files changed, 6 insertions, 20 deletions

diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index b7972f3a1ea2..36e84bfea9fc 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -227,12 +227,6 @@ awt::Rectangle AccessibleDialogControlShape::implGetBounds()
     return GetBounds();
 }
 
-// XInterface
-IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, OAccessibleExtendedComponentHelper, AccessibleDialogControlShape_BASE )
-
-// XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, OAccessibleExtendedComponentHelper, AccessibleDialogControlShape_BASE )
-
 // XComponent
 void AccessibleDialogControlShape::disposing()
 {
diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx
index 9882bac5ba63..3af6e3da90ee 100644
--- a/basctl/source/inc/accessibledialogcontrolshape.hxx
+++ b/basctl/source/inc/accessibledialogcontrolshape.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
@@ -35,13 +35,11 @@ class DialogWindow;
 
 
 
-typedef ::cppu::ImplHelper3<
-        css::accessibility::XAccessible,
-        css::lang::XServiceInfo,
-        css::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE;
-
-class AccessibleDialogControlShape final : public comphelper::OAccessibleExtendedComponentHelper,
-                                        public AccessibleDialogControlShape_BASE
+class AccessibleDialogControlShape final : public cppu::ImplInheritanceHelper<
+                                               comphelper::OAccessibleExtendedComponentHelper,
+                                               css::accessibility::XAccessible,
+                                               css::lang::XServiceInfo,
+                                               css::beans::XPropertyChangeListener>
 {
     friend class AccessibleDialogWindow;
 
@@ -79,12 +77,6 @@ public:
     AccessibleDialogControlShape (DialogWindow*, DlgEdObj*);
     virtual ~AccessibleDialogControlShape() override;
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
-
     // XEventListener
     virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override;