1 files changed, 19 insertions, 31 deletions
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 2c3a065247ac..0332b98a4175 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/accessiblecomponenthelper.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
@@ -30,10 +30,6 @@
 class VclSimpleEvent;
 class VclWindowEvent;
 
-namespace utl {
-   class AccessibleStateSetHelper;
-}
-
 namespace basctl
 {
 
@@ -41,16 +37,14 @@ class DialogWindow;
 class DlgEditor;
 class DlgEdModel;
 class DlgEdObj;
+class AccessibleDialogControlShape;
 
 
-
-typedef ::cppu::ImplHelper3 <
-    css::accessibility::XAccessible,
-    css::accessibility::XAccessibleSelection,
-    css::lang::XServiceInfo > AccessibleDialogWindow_BASE;
-
-class AccessibleDialogWindow final : public comphelper::OAccessibleExtendedComponentHelper,
-                                public AccessibleDialogWindow_BASE,
+class AccessibleDialogWindow final : public cppu::ImplInheritanceHelper<
+                                         comphelper::OAccessibleExtendedComponentHelper,
+                                         css::accessibility::XAccessible,
+                                         css::accessibility::XAccessibleSelection,
+                                         css::lang::XServiceInfo>,
                                 public SfxListener
 {
 private:
@@ -58,8 +52,8 @@ private:
     class ChildDescriptor
     {
     public:
-        DlgEdObj*                                                 pDlgEdObj;
-        css::uno::Reference< css::accessibility::XAccessible >    rxAccessible;
+        DlgEdObj*                                         pDlgEdObj;
+        rtl::Reference< AccessibleDialogControlShape >    mxAccessible;
 
         ChildDescriptor( DlgEdObj* _pDlgEdObj );
 
@@ -88,7 +82,7 @@ private:
     DECL_LINK( WindowEventListener, VclWindowEvent&, void );
 
     void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
-    void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
+    void            FillAccessibleStateSet( sal_Int64& rStateSet );
 
     // OCommonAccessibleComponent
     virtual css::awt::Rectangle implGetBounds(  ) override;
@@ -103,12 +97,6 @@ public:
     // SfxListener
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
-    // XInterface
-    DECLARE_XINTERFACE()
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER()
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override;
@@ -118,15 +106,15 @@ public:
     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_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleStateSet(  ) override;
     virtual css::lang::Locale SAL_CALL getLocale(  ) override;
 
     // XAccessibleComponent
@@ -141,13 +129,13 @@ public:
     virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override;
     virtual void SAL_CALL clearAccessibleSelection() override;
     virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) override;
 };
 
 } // namespace basctl