2 files changed, 6 insertions, 26 deletions
diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx
index 282e7ed7e817..460c90c67c41 100644
--- a/accessibility/inc/standard/vclxaccessiblebutton.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebutton.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 > VCLXAccessibleButton_BASE;
-
-class VCLXAccessibleButton final : public VCLXAccessibleTextComponent,
-                             public VCLXAccessibleButton_BASE
+class VCLXAccessibleButton final : public cppu::ImplInheritanceHelper<
+                                       VCLXAccessibleTextComponent,
+                                       css::accessibility::XAccessibleAction,
+                                       css::accessibility::XAccessibleValue>
 {
     virtual ~VCLXAccessibleButton() override = default;
 
@@ -42,13 +40,7 @@ class VCLXAccessibleButton final : public VCLXAccessibleTextComponent,
     virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
 public:
-    using VCLXAccessibleTextComponent::VCLXAccessibleTextComponent;
-
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
+    VCLXAccessibleButton( VCLXWindow* pVCLXWindow ): ImplInheritanceHelper(pVCLXWindow) {}
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index e73f56c74a22..52153a0c22b9 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -96,18 +96,6 @@ void VCLXAccessibleButton::FillAccessibleStateSet( sal_Int64& rStateSet )
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE )
-
-
 // XServiceInfo