Use ImplInheritanceHelper in OAccessibleControlContext

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

2 files changed, 3 insertions, 21 deletions

diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index e0c2f1a11cc9..416984c3344c 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@@ -20,9 +20,8 @@
 #pragma once
 
 #include <comphelper/accessiblecomponenthelper.hxx>
-#include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
 namespace vcl { class Window; }
@@ -38,8 +37,6 @@ namespace toolkit
 
 
     typedef ::comphelper::OAccessibleComponentHelper    OAccessibleControlContext_Base;
-    typedef ::cppu::ImplHelper1 <   css::lang::XEventListener
-                                >   OAccessibleControlContext_IBase;
 
     /** class implementing the AccessibleContext for a UNO control - to be used in design mode of the control.
         <p><b>life time control<b/><br/>
@@ -48,8 +45,8 @@ namespace toolkit
         is being disposed.</p>
     */
     class OAccessibleControlContext final
-            :public OAccessibleControlContext_Base
-            ,public OAccessibleControlContext_IBase
+            :public cppu::ImplInheritanceHelper<
+                OAccessibleControlContext_Base, css::lang::XEventListener>
     {
     public:
         /** creates an accessible context for a uno control
@@ -61,9 +58,6 @@ namespace toolkit
             const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator
         );
 
-        // XInterface
-        DECLARE_XINTERFACE( )
-        DECLARE_XTYPEPROVIDER( )
     private:
 
         // XAccessibleContext
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 345e486db04d..761821bce601 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -58,18 +58,6 @@ namespace toolkit
     }
 
 
-    // (order matters: the first is the class name, the second is the class doing the ref counting)
-    IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleControlContext_IBase )
-    css::uno::Sequence< css::uno::Type > SAL_CALL OAccessibleControlContext::getTypes()
-    {
-        return ::comphelper::concatSequences(
-            OAccessibleControlContext_Base::getTypes(),
-            OAccessibleControlContext_IBase::getTypes()
-        );
-    }
-    IMPLEMENT_GET_IMPLEMENTATION_ID( OAccessibleControlContext )
-
-
     void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator )
     {
         OContextEntryGuard aGuard( this );