1 files changed, 15 insertions, 34 deletions
diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
index 1652b8b0b53c..ad1f4cc7c616 100644
--- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
@@ -19,22 +19,21 @@
 #pragma once
 
 #include "TableConnection.hxx"
+#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <toolkit/awt/vclxaccessiblecomponent.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <vcl/accessibility/vclxaccessiblecomponent.hxx>
 #include <vcl/vclptr.hxx>
 
+using css::accessibility::AccessibleRelationType;
+
 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>
     {
         VclPtr<const OTableConnection>             m_pLine; // the window which I should give accessibility to
     protected:
@@ -45,46 +44,28 @@ 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;
 
-        // XAccessible
-        virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext(  ) override;
-
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
 
+        // OAccessible
+        virtual css::awt::Rectangle implGetBounds() override;
+
         // XAccessibleComponent
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
-        virtual css::awt::Rectangle SAL_CALL getBounds(  ) override;
-        virtual css::awt::Point SAL_CALL getLocation(  ) override;
-        virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
-        virtual css::awt::Size SAL_CALL getSize(  ) override;
 
         // XAccessibleRelationSet
         virtual sal_Int32 SAL_CALL getRelationCount(  ) override;
         virtual css::accessibility::AccessibleRelation SAL_CALL getRelation( sal_Int32 nIndex ) override;
-        virtual sal_Bool SAL_CALL containsRelation( sal_Int16 aRelationType ) override;
-        virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) override;
+        virtual sal_Bool SAL_CALL containsRelation(AccessibleRelationType eRelationType) override;
+        virtual css::accessibility::AccessibleRelation SAL_CALL getRelationByType(AccessibleRelationType eRelationType) override;
     };
 }