diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/accessiblecontexthelper.hxx | 6 | ||||
-rw-r--r-- | include/comphelper/accessibleselectionhelper.hxx | 24 | ||||
-rw-r--r-- | include/comphelper/accessiblewrapper.hxx | 10 | ||||
-rw-r--r-- | include/editeng/AccessibleContextBase.hxx | 6 | ||||
-rw-r--r-- | include/editeng/AccessibleEditableTextPara.hxx | 6 | ||||
-rw-r--r-- | include/editeng/AccessibleSelectionBase.hxx | 10 | ||||
-rw-r--r-- | include/editeng/AccessibleStaticTextBase.hxx | 4 | ||||
-rw-r--r-- | include/svx/AccessibleControlShape.hxx | 4 | ||||
-rw-r--r-- | include/svx/AccessibleShape.hxx | 16 | ||||
-rw-r--r-- | include/svx/AccessibleTextHelper.hxx | 4 | ||||
-rw-r--r-- | include/svx/ChildrenManager.hxx | 6 | ||||
-rw-r--r-- | include/toolkit/awt/vclxaccessiblecomponent.hxx | 6 |
12 files changed, 51 insertions, 51 deletions
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 0d15af0afc51..ea0f9b214d29 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -82,8 +82,8 @@ namespace comphelper virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; // XAccessibleContext - still waiting to be overwritten - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override = 0; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override = 0; + virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override = 0; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override = 0; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override = 0; virtual sal_Int16 SAL_CALL getAccessibleRole( ) override = 0; virtual OUString SAL_CALL getAccessibleDescription( ) override = 0; @@ -99,7 +99,7 @@ namespace comphelper <p>This basic implementation here returns the index <code>i</code> of the child for which <code><parent>.getAccessibleChild( i )</code> equals our creator.</p> */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; /** default implementation for retrieving the locale <p>This basic implementation returns the locale of the parent context, as retrieved via getAccessibleParent()->getAccessibleContext.</p> diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index 3a49c1ffd3d9..9dd339bba827 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -58,12 +58,12 @@ namespace comphelper // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) /// @throws css::uno::RuntimeException virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) = 0; + implIsSelected( sal_Int64 nAccessibleChildIndex ) = 0; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) /// @throws css::uno::RuntimeException virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) = 0; + implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) = 0; protected: @@ -72,22 +72,22 @@ namespace comphelper @throws css::lang::IndexOutOfBoundsException @throws css::uno::RuntimeException */ - void selectAccessibleChild( sal_Int32 nChildIndex ); + void selectAccessibleChild( sal_Int64 nChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - bool isAccessibleChildSelected( sal_Int32 nChildIndex ); + bool isAccessibleChildSelected( sal_Int64 nChildIndex ); /// @throws css::uno::RuntimeException void clearAccessibleSelection( ); /// @throws css::uno::RuntimeException void selectAllAccessibleChildren( ); /// @throws css::uno::RuntimeException - sal_Int32 getSelectedAccessibleChildCount( ); + sal_Int64 getSelectedAccessibleChildCount( ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ); + css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - void deselectAccessibleChild( sal_Int32 nSelectedChildIndex ); + void deselectAccessibleChild( sal_Int64 nSelectedChildIndex ); }; @@ -117,13 +117,13 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // XAccessibleSelection - default implementations - 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 nSelectedChildIndex ) 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 nSelectedChildIndex ) override; }; diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx index d01faa59554e..4493c660f216 100644 --- a/include/comphelper/accessiblewrapper.hxx +++ b/include/comphelper/accessiblewrapper.hxx @@ -199,10 +199,10 @@ namespace comphelper // XAccessibleContext /// @throws css::uno::RuntimeException - sal_Int32 baseGetAccessibleChildCount( ); + sal_Int64 baseGetAccessibleChildCount( ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::accessibility::XAccessible > baseGetAccessibleChild( sal_Int32 i ); + css::uno::Reference< css::accessibility::XAccessible > baseGetAccessibleChild( sal_Int64 i ); /// @throws css::uno::RuntimeException css::uno::Reference< css::accessibility::XAccessibleRelationSet > baseGetAccessibleRelationSet( ); @@ -281,10 +281,10 @@ namespace comphelper DECLARE_XTYPEPROVIDER( ) // 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; diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 3002784b3484..6c9dd48323eb 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -170,19 +170,19 @@ public: //===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or throw exception. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; /// Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /// Return this object's role. diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index c4fd0c4c31e3..4890f4abffc7 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -91,10 +91,10 @@ namespace accessibility 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; /// Maximal length of text returned by getAccessibleDescription() enum { MaxDescriptionLen = 40 }; diff --git a/include/editeng/AccessibleSelectionBase.hxx b/include/editeng/AccessibleSelectionBase.hxx index 25746ddc5ec7..0db8d688c21e 100644 --- a/include/editeng/AccessibleSelectionBase.hxx +++ b/include/editeng/AccessibleSelectionBase.hxx @@ -46,13 +46,13 @@ namespace accessibility public: // XAccessibleSelection - default implementations - 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 nSelectedChildIndex ) 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 nSelectedChildIndex ) override; public: diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index 2f2095f073ae..06b4abb0cdd7 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -207,10 +207,10 @@ namespace accessibility // child-related methods from XAccessibleContext /// @throws css::uno::RuntimeException - virtual sal_Int32 SAL_CALL getAccessibleChildCount(); + virtual sal_Int64 SAL_CALL getAccessibleChildCount(); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ); + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ); // child-related methods from XAccessibleComponent /// @throws css::uno::RuntimeException diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index dd456303aa53..e4567ae74e96 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -86,8 +86,8 @@ private: virtual void SAL_CALL grabFocus( ) 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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; //--- XServiceInfo --------------------------------------- diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 68750727dbcd..4149721e16de 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -130,22 +130,22 @@ public: //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) override; + sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) override; + sal_Int64 nSelectedChildIndex ) override; // ====== XAccessibleExtendedAttributes ===================================== virtual css::uno::Any SAL_CALL getExtendedAttributes() override ; @@ -210,7 +210,7 @@ public: //===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Return the specified child. @@ -224,7 +224,7 @@ public: */ virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; /// Return the set of current states. @@ -232,7 +232,7 @@ public: getAccessibleStateSet() override; /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; //===== XAccessibleComponent ============================================ diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index f1e1a32022f8..724cb0c8a7e6 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -330,13 +330,13 @@ public: @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - sal_Int32 GetChildCount() const; + sal_Int64 GetChildCount() const; /** Implements getAccessibleChild @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - css::uno::Reference<css::accessibility::XAccessible> GetChild(sal_Int32 i); + css::uno::Reference<css::accessibility::XAccessible> GetChild(sal_Int64 i); // XAccessibleEventBroadcaster child related methods diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 9f1d071ea9e7..e33acec69b15 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -119,7 +119,7 @@ public: @return If there are no children a 0 is returned. */ - tools::Long GetChildCount() const noexcept; + sal_Int64 GetChildCount() const noexcept; /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @@ -134,10 +134,10 @@ public: @throws Throws an IndexOutOfBoundsException if the index is not valid. */ - css::uno::Reference<css::accessibility::XAccessible> GetChild(tools::Long nIndex); + css::uno::Reference<css::accessibility::XAccessible> GetChild(sal_Int64 nIndex); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - const css::uno::Reference<css::drawing::XShape>& GetChildShape(tools::Long nIndex); + const css::uno::Reference<css::drawing::XShape>& GetChildShape(sal_Int64 nIndex); /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index a7ca30e7901e..7c299edf6d65 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -90,10 +90,10 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::accessibility::XAccessibleContext - sal_Int32 SAL_CALL getAccessibleChildCount( ) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + sal_Int64 SAL_CALL getAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override; css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; - sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; sal_Int16 SAL_CALL getAccessibleRole( ) override; OUString SAL_CALL getAccessibleDescription( ) override; OUString SAL_CALL getAccessibleName( ) override; |