2 files changed, 5 insertions, 25 deletions
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx
index 1e3feb81cb29..90c89922654a 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -21,15 +21,13 @@
 
 #include <standard/accessiblemenubasecomponent.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
-typedef ::cppu::ImplHelper1<
-    css::accessibility::XAccessibleSelection > OAccessibleMenuComponent_BASE;
-
-class OAccessibleMenuComponent : public OAccessibleMenuBaseComponent,
-                                 public OAccessibleMenuComponent_BASE
+class OAccessibleMenuComponent : public cppu::ImplInheritanceHelper<
+                                     OAccessibleMenuBaseComponent,
+                                     css::accessibility::XAccessibleSelection>
 {
 protected:
     virtual bool            IsEnabled() override;
@@ -40,15 +38,9 @@ protected:
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
 
-    using OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent;
-
 public:
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
+    OAccessibleMenuComponent( Menu* pMenu ): ImplInheritanceHelper(pMenu) {}
 
     // XAccessibleContext
     virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx
index 4b6323126252..92718c9b52ba 100644
--- a/accessibility/source/standard/accessiblemenucomponent.cxx
+++ b/accessibility/source/standard/accessiblemenucomponent.cxx
@@ -121,18 +121,6 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds()
 }
 
 
-// XInterface
-
-
-IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
-
-
-// XTypeProvider
-
-
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE )
-
-
 // XAccessibleContext