Use ImplInheritanceHelper in AccFrameSelectorChild

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

2 files changed, 3 insertions, 11 deletions

diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 8c684865cf84..46fcb2242896 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -233,9 +233,6 @@ AccFrameSelectorChild::~AccFrameSelectorChild()
 {
 }
 
-IMPLEMENT_FORWARD_XINTERFACE2( AccFrameSelectorChild, OAccessibleComponentHelper, OAccessibleHelper_Base )
-IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccFrameSelectorChild, OAccessibleComponentHelper, OAccessibleHelper_Base )
-
 Reference< XAccessibleContext > AccFrameSelectorChild::getAccessibleContext(  )
 {
     return this;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 26dfec6d2e6b..37ed1aa06103 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include<comphelper/accessiblecomponenthelper.hxx>
 #include <svx/framebordertype.hxx>
 
@@ -33,8 +32,6 @@ class FrameSelector;
 
 namespace a11y {
 
-typedef ::cppu::ImplHelper1<css::accessibility::XAccessible> OAccessibleHelper_Base;
-
 class AccFrameSelector final : public cppu::ImplInheritanceHelper<
                                    ::comphelper::OAccessibleComponentHelper,
                                    css::accessibility::XAccessible>
@@ -77,17 +74,15 @@ private:
     FrameSelector*      mpFrameSel;
 };
 
-class AccFrameSelectorChild final : public ::comphelper::OAccessibleComponentHelper,
-                                    public OAccessibleHelper_Base
+class AccFrameSelectorChild final : public cppu::ImplInheritanceHelper<
+                                        ::comphelper::OAccessibleComponentHelper,
+                                        css::accessibility::XAccessible>
 {
 public:
     explicit            AccFrameSelectorChild( FrameSelector& rFrameSel, FrameBorderType eBorder );
 
     virtual             ~AccFrameSelectorChild() override;
 
-    DECLARE_XINTERFACE( )
-    DECLARE_XTYPEPROVIDER( )
-
     //XAccessibleComponent
     virtual void SAL_CALL grabFocus(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;