Use ImplInheritanceHelper in OConnectionLineAccess

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

2 files changed, 6 insertions, 31 deletions

diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
index ebbfee97d435..5e14186b0765 100644
--- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
@@ -20,21 +20,20 @@
 
 #include "TableConnection.hxx"
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace dbaui
 {
-    typedef ::cppu::ImplHelper2< css::accessibility::XAccessibleRelationSet,
-                                 css::accessibility::XAccessible
-                                            > OConnectionLineAccess_BASE;
     class OTableConnection;
     /** the class OConnectionLineAccess represents the accessible object for the connection between two table windows
         like they are used in the QueryDesign and the RelationDesign
     */
-    class OConnectionLineAccess     :   public VCLXAccessibleComponent
-                                    ,   public OConnectionLineAccess_BASE
+    class OConnectionLineAccess     :   public cppu::ImplInheritanceHelper<
+                                            VCLXAccessibleComponent,
+                                            css::accessibility::XAccessibleRelationSet,
+                                            css::accessibility::XAccessible>
     {
         VclPtr<const OTableConnection>             m_pLine; // the window which I should give accessibility to
     protected:
@@ -45,20 +44,6 @@ namespace dbaui
     public:
         OConnectionLineAccess(OTableConnection* _pLine);
 
-        // XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
-        virtual void SAL_CALL acquire(  ) noexcept override
-        { // here inline is allowed because we do not use this class outside this dll
-            VCLXAccessibleComponent::acquire(  );
-        }
-        virtual void SAL_CALL release(  ) noexcept override
-        { // here inline is allowed because we do not use this class outside this dll
-            VCLXAccessibleComponent::release(  );
-        }
-
-        // XTypeProvider
-        virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) override;
-
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName() override;
 
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 9ba41e4501f7..eac2bf1756ee 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <TableConnection.hxx>
 #include <TableWindow.hxx>
-#include <comphelper/sequence.hxx>
 
 namespace dbaui
 {
@@ -36,7 +35,7 @@ namespace dbaui
     using namespace ::com::sun::star;
 
     OConnectionLineAccess::OConnectionLineAccess(OTableConnection* _pLine)
-        : VCLXAccessibleComponent(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : nullptr)
+        : ImplInheritanceHelper(_pLine->GetComponentInterface().is() ? _pLine->GetWindowPeer() : nullptr)
         ,m_pLine(_pLine)
     {
     }
@@ -45,15 +44,6 @@ namespace dbaui
         m_pLine = nullptr;
         VCLXAccessibleComponent::disposing();
     }
-    Any SAL_CALL OConnectionLineAccess::queryInterface( const Type& aType )
-    {
-        Any aRet(VCLXAccessibleComponent::queryInterface( aType ));
-        return aRet.hasValue() ? aRet : OConnectionLineAccess_BASE::queryInterface( aType );
-    }
-    Sequence< Type > SAL_CALL OConnectionLineAccess::getTypes(  )
-    {
-        return ::comphelper::concatSequences(VCLXAccessibleComponent::getTypes(),OConnectionLineAccess_BASE::getTypes());
-    }
     OUString SAL_CALL OConnectionLineAccess::getImplementationName()
     {
         return "org.openoffice.comp.dbu.ConnectionLineAccessibility";