diff options
266 files changed, 1706 insertions, 1468 deletions
diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index ba00e00d6c91..82211f1aec32 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -62,12 +62,12 @@ protected: // XAccessibleContext /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; // XAccessibleComponent @@ -166,7 +166,7 @@ protected: @return The XAccessible interface of the specified child. */ css::uno::Reference< css::accessibility::XAccessible > - implGetFixedChild( sal_Int32 nChildIndex ); + implGetFixedChild( sal_Int64 nChildIndex ); /** This method creates and returns an accessible table. @return An AccessibleBrowseBoxTable. */ diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index b10cb4d7bc7e..d8bcd169ac2e 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -108,7 +108,7 @@ public: virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** @return The description of this object. diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index cb2a771100ae..dbc2fbd52aaf 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -59,10 +59,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 OUString SAL_CALL getImplementationName() override; - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; // XAccessibleValue diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index 64d41cb6d2d9..c8f2e8b835c4 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -59,11 +59,10 @@ public: The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent @@ -116,10 +115,10 @@ public: // XAccessibleSelection /** Selects the specified child (row or column of the table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; /** @return TRUE, if the specified child (row/column) is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; /** Clears the complete selection. */ virtual void SAL_CALL clearAccessibleSelection() override; @@ -128,14 +127,14 @@ public: virtual void SAL_CALL selectAllAccessibleChildren() override; /** @return The number of selected rows/columns. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount() override; /** @return The specified selected row/column. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; /** Removes the specified row/column from the selection. */ - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; // XInterface @@ -191,7 +190,7 @@ private: @return The absolute child index from the index of selected children. @throws <type>IndexOutOfBoundsException</type> If the specified index is invalid. */ - sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex ); + sal_Int64 implGetChildIndexFromSelectedIndex( sal_Int64 nSelectedChildIndex ); /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index 61e667d594c4..a3062a12ea89 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -32,14 +32,14 @@ namespace accessibility const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** Grabs the focus to the BrowseBox. */ virtual void SAL_CALL grabFocus() override; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx index 78c5cc4a9a3d..3f8d3a274c5b 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx @@ -44,10 +44,10 @@ public: /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index b482ab0d8b4f..422aa177ad48 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -59,7 +59,7 @@ public: // XAccessibleContext /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() override; @@ -101,13 +101,13 @@ public: getAccessibleSummary() override; /** @return The child index of the specified cell. */ - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The row index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; /** @return The column index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; /* Derived classes have to implement: - getAccessibleRowDescription, @@ -170,14 +170,14 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The number of cells of the table. */ - sal_Int32 implGetChildCount() const; + sal_Int64 implGetChildCount() const; /** @attention This method requires locked mutex's and a living object. @return The row index of the specified cell index. */ - sal_Int32 implGetRow( sal_Int32 nChildIndex ) const; + sal_Int32 implGetRow( sal_Int64 nChildIndex ) const; /** @attention This method requires locked mutex's and a living object. @return The column index of the specified cell index. */ - sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const; + sal_Int32 implGetColumn( sal_Int64 nChildIndex ) const; /** @attention This method requires locked mutex's and a living object. @return TRUE, if the specified row is selected. */ @@ -228,7 +228,7 @@ protected: /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified child index is invalid. */ - void ensureIsValidIndex( sal_Int32 nChildIndex ); + void ensureIsValidIndex( sal_Int64 nChildIndex ); }; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 09ee9c62d26b..166b7f38035b 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -66,7 +66,7 @@ namespace accessibility virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** @return The name of this class. @@ -76,13 +76,13 @@ namespace accessibility /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** Return a bitset of states of the current object. */ diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 302f240ee65f..c58880b9a0f4 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -51,11 +51,11 @@ class AccessibleGridControl final : public AccessibleGridControlBase // XAccessibleContext ----------------------------------------------------- /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() override; @@ -131,7 +131,7 @@ private: @attention This method requires locked mutex's and a living object. @return The XAccessible interface of the specified child. */ css::uno::Reference< css::accessibility::XAccessible > - implGetFixedChild( sal_Int32 nChildIndex ); + implGetFixedChild( sal_Int64 nChildIndex ); /** This method creates and returns an accessible table. @return An AccessibleGridControlTable. */ @@ -150,7 +150,7 @@ private: rtl::Reference<AccessibleGridControlHeader> m_xColumnHeaderBar; /** @return The count of visible children. */ - inline sal_Int32 implGetAccessibleChildCount(); + inline sal_Int64 implGetAccessibleChildCount(); }; diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 6338d147d64f..ca706c977fcd 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -79,7 +79,7 @@ public: getAccessibleParent() override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** @return The description of this object. diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index 63cef92cebec..680b1ceced6a 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -51,10 +51,10 @@ public: The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index 003c3bbb4468..d530a06736de 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -31,14 +31,14 @@ namespace accessibility ::vcl::table::IAccessibleTable& _rTable, ::vcl::table::AccessibleTableControlObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** Grabs the focus to the GridControl. */ virtual void SAL_CALL grabFocus() override; diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index 69e3d9229694..deb6fbf6e06b 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -49,10 +49,10 @@ public: /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent @@ -104,10 +104,10 @@ public: // XAccessibleSelection /** Selects the specified child (row or column of the table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; /** @return TRUE, if the specified child (row/column) is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; /** Clears the complete selection. */ virtual void SAL_CALL clearAccessibleSelection() override; @@ -116,14 +116,14 @@ public: virtual void SAL_CALL selectAllAccessibleChildren() override; /** @return The number of selected rows/columns. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount() override; /** @return The specified selected row/column. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; /** Removes the specified row/column from the selection. */ - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; // XInterface /** Queries for a new interface. */ diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index 6ef2737afb87..e8cf6bfe9b92 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -55,7 +55,7 @@ public: // XAccessibleContext /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The role of this object (a table). */ virtual sal_Int16 SAL_CALL getAccessibleRole() override; @@ -95,13 +95,13 @@ public: getAccessibleSummary() override; /** @return The child index of the specified cell. */ - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The row index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; /** @return The column index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; /* Derived classes have to implement: - getAccessibleRowDescription, @@ -139,10 +139,10 @@ protected: /** @attention This method requires locked mutex's and a living object. @return The row index of the specified cell index. */ - sal_Int32 implGetRow( sal_Int32 nChildIndex ) const; + sal_Int32 implGetRow( sal_Int64 nChildIndex ) const; /** @attention This method requires locked mutex's and a living object. @return The column index of the specified cell index. */ - sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const; + sal_Int32 implGetColumn( sal_Int64 nChildIndex ) const; /** Fills a sequence with sorted indexes of completely selected rows. @attention This method requires locked mutex's and a living object. @@ -164,7 +164,7 @@ protected: /** @attention This method requires locked mutex's and a living object. @throws <type>IndexOutOfBoundsException</type> If the specified child index is invalid. */ - void ensureIsValidIndex( sal_Int32 nChildIndex ); + void ensureIsValidIndex( sal_Int64 nChildIndex ); }; diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index 2d89d009153d..cbb06ebd1477 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -94,7 +94,7 @@ namespace accessibility virtual void SAL_CALL release() noexcept override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** @return The name of this class. @@ -104,13 +104,13 @@ namespace accessibility /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; /** Return a bitset of states of the current object. */ diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index ffb1cf5fb695..615266637b32 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -66,8 +66,8 @@ namespace accessibility sal_Int16 SAL_CALL getAccessibleRole() override; - 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 void SAL_CALL disposing( const css::lang::EventObject& Source ) override; diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index 9f3f64d2658f..cd27fcb7da3f 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -75,21 +75,21 @@ 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; void SAL_CALL clearAccessibleSelection( ) override; void SAL_CALL selectAllAccessibleChildren( ) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; }; diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index 93077f89bcf2..67724ae710b8 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -117,10 +117,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; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index abb09388c952..339e32f3b0b7 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -91,21 +91,21 @@ 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; void SAL_CALL clearAccessibleSelection( ) override; void SAL_CALL selectAllAccessibleChildren( ) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; private: diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index b065e8947c49..6ae837f4de4b 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -141,10 +141,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; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; @@ -194,13 +194,13 @@ namespace accessibility virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; void SAL_CALL clearAccessibleSelection( ) override; void SAL_CALL selectAllAccessibleChildren( ) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; // XAccessibleValue virtual css::uno::Any SAL_CALL getCurrentValue( ) override; diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index f8a9bb2b5eb9..f2795b59106e 100644 --- a/accessibility/inc/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -71,10 +71,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; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index 35c0b9baf417..75f105ae72f3 100644 --- a/accessibility/inc/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -85,10 +85,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; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx index 18d964b11005..2c7bc2fced93 100644 --- a/accessibility/inc/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx @@ -83,10 +83,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; virtual OUString SAL_CALL getAccessibleDescription( ) override; virtual OUString SAL_CALL getAccessibleName( ) override; @@ -106,13 +106,13 @@ namespace accessibility 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; }; diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx index 17f30ce60fbe..3a403ab09af0 100644 --- a/accessibility/inc/extended/accessibletablistbox.hxx +++ b/accessibility/inc/extended/accessibletablistbox.hxx @@ -58,11 +58,11 @@ public: // XAccessibleContext ----------------------------------------------------- /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) override; + getAccessibleChild( sal_Int64 nChildIndex ) override; // XAccessibleContext css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx index 73d5660b63a7..b2f2b4277aae 100644 --- a/accessibility/inc/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/extended/accessibletablistboxtable.hxx @@ -45,7 +45,7 @@ private: // helpers ---------------------------------------------------------------- /** Throws an exception, if nIndex is not a valid child index. */ - void ensureValidIndex( sal_Int32 _nIndex ) const; + void ensureValidIndex( sal_Int64 _nIndex ) const; /** Selects the specified row. */ void implSelectRow( sal_Int32 _nRow, bool _bSelect ); @@ -58,7 +58,7 @@ private: sal_Int32 implGetSelRowCount() const; /** Returns the row index from cell index. */ - sal_Int32 implGetRow( sal_Int32 _nIndex ) const + sal_Int32 implGetRow( sal_Int64 _nIndex ) const { auto nColCount = implGetColumnCount(); assert(nColCount != 0); @@ -91,13 +91,13 @@ public: virtual OUString SAL_CALL getImplementationName() override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; void SAL_CALL clearAccessibleSelection( ) override; void SAL_CALL selectAllAccessibleChildren( ) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; }; diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 2c8336b8181a..47bb7be81a0c 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -160,15 +160,15 @@ private: virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild(::sal_Int32 i) override; + 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; @@ -467,10 +467,10 @@ public: retrieveParagraphRelationSet( Paragraph const * pParagraph ); private: - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleChild(::sal_Int32 i) override; + SAL_CALL getAccessibleChild(sal_Int64 i) override; virtual ::sal_Int16 SAL_CALL getAccessibleRole() override; diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 2d0f838a52d6..4bb176b8fcc1 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -77,9 +77,9 @@ protected: void UpdateAccessibleName( sal_Int32 i ); void UpdateItemText( sal_Int32 i ); - sal_Int32 GetChildCount() const; + sal_Int64 GetChildCount() const; - css::uno::Reference< css::accessibility::XAccessible > GetChild( sal_Int32 i ); + css::uno::Reference< css::accessibility::XAccessible > GetChild( sal_Int64 i ); css::uno::Reference< css::accessibility::XAccessible > GetChildAt( const css::awt::Point& rPoint ); void InsertChild( sal_Int32 i ); diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx index b82a7c0ab57f..1e3feb81cb29 100644 --- a/accessibility/inc/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/standard/accessiblemenucomponent.hxx @@ -51,8 +51,8 @@ public: 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; @@ -73,13 +73,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; }; diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx index 55550d53a36e..b6adebbde81e 100644 --- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx @@ -61,10 +61,10 @@ public: virtual ~OAccessibleMenuItemComponent() 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; diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index dd3f6914c26c..9b1c5aadbc45 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -69,13 +69,13 @@ public: actual list. The text field is not provided for non drop down list boxes. */ - sal_Int32 SAL_CALL getAccessibleChildCount() final override; + sal_Int64 SAL_CALL getAccessibleChildCount() final override; /** For drop down list boxes the text field is a not editable VCLXAccessibleTextField, for combo boxes it is an editable VCLXAccessibleEdit. */ css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 i) override; + getAccessibleChild (sal_Int64 i) override; /** The role is always AccessibleRole::COMBO_BOX. */ sal_Int16 SAL_CALL getAccessibleRole() override; @@ -152,7 +152,7 @@ protected: virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override; - sal_Int32 implGetAccessibleChildCount(); + sal_Int64 implGetAccessibleChildCount(); }; diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index 81659d2c9ea3..267f71e19632 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -66,8 +66,8 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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 sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleAction diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx index 9069f991b2cd..505e0f2859d8 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx @@ -34,9 +34,9 @@ public: VCLXAccessibleHeaderBar(VCLXWindow* pVCLXindow); // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference<css::accessibility::XAccessible> - SAL_CALL getAccessibleChild(sal_Int32 i) override; + SAL_CALL getAccessibleChild(sal_Int64 i) override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XServiceInfo diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx index 88bbc68e943b..e78950bded6f 100644 --- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx @@ -69,10 +69,10 @@ 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; diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index f1d5520a52da..74f6d5755d17 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -87,16 +87,16 @@ public: getAccessibleContext() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override final; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override final; css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 i) override; + getAccessibleChild (sal_Int64 i) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; /** The index returned as index in parent is always the one set with the SetIndexInParent() method. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XServiceInfo @@ -106,13 +106,13 @@ public: getSupportedServiceNames() 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 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; virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; bool IsInDropDown() const; @@ -139,7 +139,7 @@ private: virtual ~VCLXAccessibleList() override = default; - sal_Int32 implGetAccessibleChildCount(); + sal_Int64 implGetAccessibleChildCount(); /** This function is called from the implementation helper during a XComponent::dispose call. Free the list of items and the items themselves. diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index 6952bd5eea1e..046f1df125a3 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -104,10 +104,10 @@ 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; diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index 1bd7be7d1e77..e866a53a3d8a 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -35,7 +35,7 @@ class VCLXAccessibleMenu final : public VCLXAccessibleMenuItem, { virtual bool IsFocused() override; virtual bool IsPopupMenuOpen() override; - sal_Int32 implGetSelectedAccessibleChildCount(); + sal_Int64 implGetSelectedAccessibleChildCount(); public: using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem; @@ -51,21 +51,21 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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 sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleComponent virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) 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; // XAccessibleAction virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx index a81f0457f0be..c5b3984e0b7e 100644 --- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx @@ -51,7 +51,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleExtendedComponent diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx index 2d4c486e677c..8e93af22d8d9 100644 --- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx @@ -33,7 +33,7 @@ public: virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleExtendedComponent diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index bae4ed9d0985..16bff48e3856 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -56,8 +56,8 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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; // XAccessibleComponent virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 5be9739722dc..0e82ed4b3ab7 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -87,10 +87,10 @@ 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) override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(sal_Int64) 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/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index ab6cdb620eb9..233e7277cb27 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -41,7 +41,7 @@ private: AccessibleChildren m_aAccessibleChildren; VclPtr<TabControl> m_pTabControl; - css::uno::Reference< css::accessibility::XAccessible > implGetAccessibleChild( sal_Int32 i ); + css::uno::Reference< css::accessibility::XAccessible > implGetAccessibleChild( sal_Int64 i ); bool implIsAccessibleChildSelected( sal_Int32 nChildIndex ); @@ -74,19 +74,19 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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 sal_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleName( ) 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; }; diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 2d78f889264f..0548ef344634 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -49,7 +49,7 @@ private: bool m_bSelected; OUString m_sPageText; - sal_Int32 implGetAccessibleChildCount(); + sal_Int64 implGetAccessibleChildCount(); bool IsFocused() const; bool IsSelected() const; @@ -95,10 +95,10 @@ 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; diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx index 36254ceeca37..826aa8daad91 100644 --- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx @@ -45,7 +45,7 @@ public: // XAccessibleContext 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; }; diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index 5d29de76624d..f99b6c0296f6 100644 --- a/accessibility/inc/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -51,9 +51,9 @@ public: getAccessibleContext() override; // XAccessibleContext - sal_Int32 SAL_CALL getAccessibleChildCount() override; + sal_Int64 SAL_CALL getAccessibleChildCount() override; css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 i) override; + getAccessibleChild (sal_Int64 i) override; sal_Int16 SAL_CALL getAccessibleRole() override; css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index 7518f3f7a154..0b2908d1dc32 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -51,7 +51,7 @@ private: void UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, bool bOpen ); void HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent ); void ReleaseSubToolBox( ToolBox* _pSubToolBox ); - sal_Int32 implGetAccessibleChildCount(); + sal_Int64 implGetAccessibleChildCount(); virtual ~VCLXAccessibleToolBox() override; @@ -79,18 +79,18 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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 getAccessibleAtPoint( const css::awt::Point& aPoint ) 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; private: void implReleaseToolboxItem( diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index 9f93f9658791..39982db1b7e8 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -98,10 +98,10 @@ 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; diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 6bc4865c6d4d..539f10df1cc3 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -90,7 +90,7 @@ void SAL_CALL AccessibleBrowseBox::disposing() // css::accessibility::XAccessibleContext -sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -100,11 +100,14 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL -AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) +AccessibleBrowseBox::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + css::uno::Reference< css::accessibility::XAccessible > xRet; if( nChildIndex >= 0 ) { @@ -223,7 +226,7 @@ AccessibleBrowseBox::implGetHeaderBar(AccessibleBrowseBoxObjType eObjType) } css::uno::Reference< css::accessibility::XAccessible > -AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) +AccessibleBrowseBox::implGetFixedChild( sal_Int64 nChildIndex ) { css::uno::Reference< css::accessibility::XAccessible > xRet; switch( nChildIndex ) diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 69981e9640aa..a3b0b0891c53 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -126,13 +126,13 @@ Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::g return mxParent; } -sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY ); @@ -145,8 +145,8 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() { css::uno::Reference< uno::XInterface > xChild; - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for( sal_Int64 nChild = 0; nChild < nChildCount; ++nChild ) { xChild.set(xParentContext->getAccessibleChild( nChild ), css::uno::UNO_QUERY); diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 6efbb5a1199a..645b544176d2 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -123,12 +123,12 @@ namespace accessibility } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) { return 0; } - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int64 ) { throw css::lang::IndexOutOfBoundsException(); } @@ -138,12 +138,12 @@ namespace accessibility return "com.sun.star.comp.svtools.TableCheckBoxCell"; } - sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent() + sal_Int64 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent() { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); - return ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); + return (static_cast<sal_Int64>(getRowPos()) * static_cast<sal_Int64>(mpBrowseBox->GetColumnCount())) + getColumnPos(); } void AccessibleCheckBoxCell::SetChecked( bool _bChecked ) diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index 3d3541e4a19b..50f5d0c33422 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -52,7 +52,7 @@ AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar() // XAccessibleContext --------------------------------------------------------- Reference< XAccessible > SAL_CALL -AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) +AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -61,7 +61,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) return implGetChild( nChildIndex, implToVCLColumnPos( nChildIndex ) ); } -sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() { return isRowBar() ? vcl::BBINDEX_ROWHEADERBAR : vcl::BBINDEX_COLUMNHEADERBAR; } @@ -192,7 +192,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( // XAccessibleSelection ------------------------------------------------------- -void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -204,7 +204,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nCh implSelectColumn( implToVCLColumnPos( nChildIndex ), true ); } -sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int64 nChildIndex ) { // using interface methods - no mutex return isRowBar() ? @@ -232,7 +232,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() implSelectColumn( implToVCLColumnPos( 0 ), true ); } -sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -241,18 +241,19 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount } Reference< XAccessible > SAL_CALL -AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); // method may throw lang::IndexOutOfBoundsException - sal_Int32 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex ); + sal_Int64 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex ); + assert(nIndex < std::numeric_limits<sal_Int32>::max()); return implGetChild( nIndex, implToVCLColumnPos( nIndex ) ); } void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -332,8 +333,8 @@ Reference< XAccessible > AccessibleBrowseBoxHeaderBar::implGetChild( mpBrowseBox->CreateAccessibleColumnHeader( nColumnPos ); } -sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex( - sal_Int32 nSelectedChildIndex ) +sal_Int64 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex( + sal_Int64 nSelectedChildIndex ) { Sequence< sal_Int32 > aSelSeq; if( isRowBar() ) diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 610d4f9fe4c5..619e7780947e 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -76,7 +76,7 @@ sal_Int64 AccessibleBrowseBoxHeaderCell::implCreateStateSet() /** @return The count of visible children. */ -sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() { return 0; } @@ -85,7 +85,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() /** @return The XAccessible interface of the specified child. */ -Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int32 ) +Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int64 ) { throw IndexOutOfBoundsException(); } @@ -139,11 +139,11 @@ tools::Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen() return getRectangle(mpBrowseBox,m_nColumnRowId,true,isRowBarCell()); } -sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); - sal_Int32 nIndex = m_nColumnRowId; + sal_Int64 nIndex = m_nColumnRowId; if ( mpBrowseBox->HasRowHeader() ) --nIndex; return nIndex; diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index d245c5155ba8..9b58bf83d785 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -49,7 +49,7 @@ AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable() // XAccessibleContext --------------------------------------------------------- Reference< XAccessible > SAL_CALL -AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) +AccessibleBrowseBoxTable::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -59,7 +59,7 @@ AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) implGetRow( nChildIndex ), static_cast<sal_Int16>(implGetColumn( nChildIndex )) ); } -sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() { osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index ebb6e06e099d..a1ae5a969dcb 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -47,7 +47,7 @@ AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase( // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -107,16 +107,16 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSum return nullptr; // not supported } -sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( +sal_Int64 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); - return nRow * implGetColumnCount() + nColumn; + return static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(implGetColumnCount()) + nColumn; } -sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -124,7 +124,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nCh return implGetRow( nChildIndex ); } -sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -201,18 +201,18 @@ sal_uInt16 AccessibleBrowseBoxTableBase::implToVCLColumnPos( sal_Int32 nColumn ) return nVCLPos; } -sal_Int32 AccessibleBrowseBoxTableBase::implGetChildCount() const +sal_Int64 AccessibleBrowseBoxTableBase::implGetChildCount() const { - return implGetRowCount() * implGetColumnCount(); + return static_cast<sal_Int64>(implGetRowCount()) * static_cast<sal_Int64>(implGetColumnCount()); } -sal_Int32 AccessibleBrowseBoxTableBase::implGetRow( sal_Int32 nChildIndex ) const +sal_Int32 AccessibleBrowseBoxTableBase::implGetRow( sal_Int64 nChildIndex ) const { sal_Int32 nColumns = implGetColumnCount(); return nColumns ? (nChildIndex / nColumns) : 0; } -sal_Int32 AccessibleBrowseBoxTableBase::implGetColumn( sal_Int32 nChildIndex ) const +sal_Int32 AccessibleBrowseBoxTableBase::implGetColumn( sal_Int64 nChildIndex ) const { sal_Int32 nColumns = implGetColumnCount(); return nColumns ? (nChildIndex % nColumns) : 0; @@ -279,7 +279,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidAddress( ensureIsValidColumn( nColumn ); } -void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) +void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int64 nChildIndex ) { if( nChildIndex >= implGetChildCount() ) throw lang::IndexOutOfBoundsException( "child index is invalid", *this ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 9ebda45ddc8c..0b9110e361cf 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -142,14 +142,14 @@ namespace accessibility } /** @return The count of visible children. */ - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount() + sal_Int64 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount() { return 0; } /** @return The XAccessible interface of the specified child. */ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int32 ) + AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int64 ) { throw css::lang::IndexOutOfBoundsException(); } @@ -189,12 +189,12 @@ namespace accessibility // XAccessibleContext ----------------------------------------------------- - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent() + sal_Int64 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); - return /*vcl::BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); + return /*vcl::BBINDEX_FIRSTCONTROL*/ m_nOffset + (static_cast<sal_Int64>(getRowPos()) * static_cast<sal_Int64>(mpBrowseBox->GetColumnCount())) + getColumnPos(); } sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( ) diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index a3d016194a27..800ab312d19e 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -71,7 +71,7 @@ void SAL_CALL AccessibleGridControl::disposing() AccessibleGridControlBase::disposing(); } -sal_Int32 AccessibleGridControl::implGetAccessibleChildCount() +sal_Int64 AccessibleGridControl::implGetAccessibleChildCount() { return m_aTable.GetAccessibleControlCount(); } @@ -79,7 +79,7 @@ sal_Int32 AccessibleGridControl::implGetAccessibleChildCount() // css::accessibility::XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleGridControl::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -88,7 +88,7 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL -AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) +AccessibleGridControl::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; @@ -233,7 +233,7 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType } css::uno::Reference< css::accessibility::XAccessible > -AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) +AccessibleGridControl::implGetFixedChild( sal_Int64 nChildIndex ) { css::uno::Reference< css::accessibility::XAccessible > xRet; switch( nChildIndex ) @@ -263,10 +263,10 @@ rtl::Reference<AccessibleGridControlTable> AccessibleGridControl::createAccessib void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue) { - sal_Int32 nChildCount = implGetAccessibleChildCount(); + sal_Int64 nChildCount = implGetAccessibleChildCount(); if(nChildCount != 0) { - for(sal_Int32 i=0;i<nChildCount;i++) + for(sal_Int64 i=0;i<nChildCount;i++) { css::uno::Reference< css::accessibility::XAccessible > xAccessible = getAccessibleChild(i); if(css::uno::Reference< css::accessibility::XAccessible >(m_xTable) == xAccessible) diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 79a57029259d..37e3235ee711 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -94,14 +94,14 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridCo return m_xParent; } -sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() { SolarMutexGuard g; ensureIsAlive(); // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY ); @@ -114,8 +114,8 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() { css::uno::Reference< uno::XInterface > xChild; - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for( sal_Int64 nChild = 0; nChild < nChildCount; ++nChild ) { xChild.set(xParentContext->getAccessibleChild( nChild ), css::uno::UNO_QUERY); if ( xMeMyselfAndI.get() == xChild.get() ) diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 077e3ea5b6dd..3c6a2edb9a5a 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -51,7 +51,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader( // XAccessibleContext --------------------------------------------------------- Reference< XAccessible > SAL_CALL -AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) +AccessibleGridControlHeader::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; @@ -72,7 +72,7 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) return xChild; } -sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 8bcf4b830fbb..ba7d4488945c 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -68,7 +68,7 @@ sal_Int64 AccessibleGridControlHeaderCell::implCreateStateSet() /** @return The count of visible children. */ -sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() { return 0; } @@ -77,7 +77,7 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() /** @return The XAccessible interface of the specified child. */ -Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChild( sal_Int32 ) +Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChild( sal_Int64 ) { throw IndexOutOfBoundsException(); } @@ -148,13 +148,12 @@ tools::Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen() return tools::Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize()); } -sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() { SolarMutexGuard g; ensureIsAlive(); - sal_Int32 nIndex = m_nColumnRowId; - return nIndex; + return m_nColumnRowId; } } // namespace accessibility diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 00788cdf2d31..2c50501cba56 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -51,15 +51,16 @@ AccessibleGridControlTable::AccessibleGridControlTable( // XAccessibleContext --------------------------------------------------------- Reference< XAccessible > SAL_CALL -AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) +AccessibleGridControlTable::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); ensureIsValidIndex( nChildIndex ); - sal_Int32 nCount = getAccessibleChildCount(); + sal_Int64 nCount = getAccessibleChildCount(); if(m_aCellVector.empty() || m_aCellVector.size() != static_cast<unsigned>(nCount)) { + assert(o3tl::make_unsigned(nCount) < m_aCellVector.max_size()); m_aCellVector.resize(nCount); } if(!m_aCellVector[nChildIndex].is()) @@ -70,7 +71,7 @@ AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) return m_aCellVector[nChildIndex]; } -sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent() { SolarMutexGuard aSolarGuard; @@ -186,7 +187,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellA ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); - sal_Int32 nChildIndex = nRow*m_aTable.GetColumnCount() + nColumn; + sal_Int64 nChildIndex = static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(m_aTable.GetColumnCount()) + nColumn; return getAccessibleChild(nChildIndex); } @@ -200,7 +201,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( //selection of single cells not possible, so if row is selected, the cell will be selected too return isAccessibleRowSelected(nRow); } -void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; @@ -210,7 +211,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil sal_Int32 nRow = nChildIndex / nColumns; m_aTable.SelectRow( nRow, true ); } -sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; @@ -237,17 +238,17 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() for(tools::Long i=0; i<m_aTable.GetRowCount(); i++) selectedRowsRange[i]=i; } -sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() { SolarMutexGuard aSolarGuard; ensureIsAlive(); Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows(); sal_Int32 nColumns = m_aTable.GetColumnCount(); - return selectedRows.getLength()*nColumns; + return static_cast<sal_Int64>(selectedRows.getLength()) * static_cast<sal_Int64>(nColumns); } Reference< XAccessible > SAL_CALL -AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; @@ -259,7 +260,7 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild } //not implemented yet, because only row selection possible void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild( - sal_Int32 ) + sal_Int64 ) { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 7ed42bc6b830..cc600760cfe9 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -47,16 +47,16 @@ AccessibleGridControlTableBase::AccessibleGridControlTableBase( // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ensureIsAlive(); - sal_Int32 nChildren = 0; + sal_Int64 nChildren = 0; if(m_eObjType == TCTYPE_ROWHEADERBAR) nChildren = m_aTable.GetRowCount(); else if(m_eObjType == TCTYPE_TABLE) - nChildren = m_aTable.GetRowCount()*m_aTable.GetColumnCount(); + nChildren = static_cast<sal_Int64>(m_aTable.GetRowCount()) * static_cast<sal_Int64>(m_aTable.GetColumnCount()); else if(m_eObjType == TCTYPE_COLUMNHEADERBAR) nChildren = m_aTable.GetColumnCount(); return nChildren; @@ -124,17 +124,17 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleS return nullptr; // not supported } -sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( +sal_Int64 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); - return nRow * m_aTable.GetColumnCount() + nColumn; + return static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(m_aTable.GetColumnCount()) + nColumn; } -sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; @@ -143,7 +143,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 n return implGetRow( nChildIndex ); } -sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; @@ -187,13 +187,13 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationI // internal helper methods ---------------------------------------------------- -sal_Int32 AccessibleGridControlTableBase::implGetRow( sal_Int32 nChildIndex ) const +sal_Int32 AccessibleGridControlTableBase::implGetRow( sal_Int64 nChildIndex ) const { sal_Int32 nColumns = m_aTable.GetColumnCount(); return nColumns ? (nChildIndex / nColumns) : 0; } -sal_Int32 AccessibleGridControlTableBase::implGetColumn( sal_Int32 nChildIndex ) const +sal_Int32 AccessibleGridControlTableBase::implGetColumn( sal_Int64 nChildIndex ) const { sal_Int32 nColumns = m_aTable.GetColumnCount(); return nColumns ? (nChildIndex % nColumns) : 0; @@ -227,9 +227,9 @@ void AccessibleGridControlTableBase::ensureIsValidAddress( ensureIsValidColumn( nColumn ); } -void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) +void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int64 nChildIndex ) { - if( nChildIndex >= m_aTable.GetRowCount()*m_aTable.GetColumnCount() ) + if (nChildIndex >= static_cast<sal_Int64>(m_aTable.GetRowCount()) * static_cast<sal_Int64>(m_aTable.GetColumnCount())) throw lang::IndexOutOfBoundsException( "child index is invalid", *this ); } diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 317a6ac6acd6..f8a699f54823 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -165,13 +165,13 @@ namespace accessibility } /** @return The count of visible children. */ - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount() + sal_Int64 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount() { return 0; } /** @return The css::accessibility::XAccessible interface of the specified child. */ - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 ) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlTableCell::getAccessibleChild( sal_Int64 ) { throw css::lang::IndexOutOfBoundsException(); } @@ -210,13 +210,13 @@ namespace accessibility // css::accessibility::XAccessibleContext - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent() + sal_Int64 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent() { SolarMutexGuard aSolarGuard; ensureIsAlive(); - return ( getRowPos() * m_aTable.GetColumnCount() ) + getColumnPos(); + return (static_cast<sal_Int64>(getRowPos()) * static_cast<sal_Int64>(m_aTable.GetColumnCount())) + getColumnPos(); } sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition( ) @@ -328,7 +328,7 @@ namespace accessibility vcl::Window* pParent = m_aTable.GetAccessibleParentWindow(); DBG_ASSERT( pParent, "implGetBoundingBox - missing parent window" ); tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( pParent ); - sal_Int32 nIndex = getAccessibleIndexInParent(); + sal_Int64 nIndex = getAccessibleIndexInParent(); tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount()); tools::Long nX = aGridRect.Left() + aCellRect.Left(); tools::Long nY = aGridRect.Top() + aCellRect.Top(); @@ -339,7 +339,7 @@ namespace accessibility tools::Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen() { tools::Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( nullptr ); - sal_Int32 nIndex = getAccessibleIndexInParent(); + sal_Int64 nIndex = getAccessibleIndexInParent(); tools::Rectangle aCellRect = m_aTable.calcCellRect(nIndex%m_aTable.GetColumnCount(), nIndex/m_aTable.GetColumnCount()); tools::Long nX = aGridRect.Left() + aCellRect.Left(); tools::Long nY = aGridRect.Top() + aCellRect.Top(); diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index bf3a332bac03..d447b906e394 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -132,7 +132,7 @@ namespace accessibility // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE? } - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) + sal_Int64 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -140,7 +140,7 @@ namespace accessibility return baseGetAccessibleChildCount(); } - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int64 i ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 9632a6665ab4..72ce9854e204 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -147,17 +147,20 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); return getCtrl()->GetEntryCount(); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int64 i ) { ::comphelper::OExternalLockGuard aGuard( this ); + if (i < 0 || i >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl(); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry(i); if ( !pEntry ) @@ -202,10 +205,13 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) + void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int64 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl(); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( nChildIndex ); if ( !pEntry ) @@ -214,10 +220,13 @@ namespace accessibility pCtrl->SetCursor( pEntry ); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int64 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl(); SvxIconChoiceCtrlEntry* pEntry = pCtrl->GetEntry( nChildIndex ); if ( !pEntry ) @@ -246,11 +255,11 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); - sal_Int32 nSelCount = 0; + sal_Int64 nSelCount = 0; VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl(); sal_Int32 nCount = pCtrl->GetEntryCount(); for ( sal_Int32 i = 0; i < nCount; ++i ) @@ -263,7 +272,7 @@ namespace accessibility return nSelCount; } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -290,7 +299,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 86abc128eb28..f8933e49a5ff 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -245,12 +245,12 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) { return 0; // no children } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int64 ) { throw IndexOutOfBoundsException(); } @@ -263,7 +263,7 @@ namespace accessibility return m_xParent; } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 21d58fa8da5e..df4a9a759c0f 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -300,7 +300,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -312,7 +312,7 @@ namespace accessibility return nCount; } - Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int64 i ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -394,7 +394,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) + void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int64 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -405,10 +405,13 @@ namespace accessibility getListBox()->Select( pEntry ); } - sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int64 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + SvTreeListEntry* pEntry = getListBox()->GetEntry( nChildIndex ); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -442,14 +445,14 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); return getListBox()->GetSelectionCount(); } - Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -457,7 +460,7 @@ namespace accessibility throw IndexOutOfBoundsException(); Reference< XAccessible > xChild; - sal_Int32 nSelCount= 0; + sal_Int64 nSelCount= 0; sal_Int32 nCount = getListBox()->GetLevelChildCount( nullptr ); for ( sal_Int32 i = 0; i < nCount; ++i ) { @@ -478,7 +481,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index b3aa55f7e154..f87227dd4531 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -286,7 +286,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -300,7 +300,7 @@ namespace accessibility return nCount; } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int64 i ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -365,7 +365,7 @@ namespace accessibility return implGetParentAccessible( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -818,13 +818,16 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) + void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + SvTreeListEntry* pEntry = GetRealChild(nChildIndex); if ( !pEntry ) throw IndexOutOfBoundsException(); @@ -832,13 +835,16 @@ namespace accessibility m_pTreeListBox->Select( pEntry ); } - sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath( m_aEntryPath ); SvTreeListEntry* pEntry = m_pTreeListBox->GetEntry( pParent, nChildIndex ); if ( !pEntry ) @@ -885,20 +891,20 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); - sal_Int32 i, nSelCount = 0, nCount = 0; + sal_Int64 nSelCount = 0; SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath( m_aEntryPath ); if ( !pParent ) throw RuntimeException("AccessibleListBoxEntry::getSelectedAccessibleChildCount - pParent cannot be empty!"); - nCount = m_pTreeListBox->GetLevelChildCount( pParent ); - for ( i = 0; i < nCount; ++i ) + sal_Int32 nCount = m_pTreeListBox->GetLevelChildCount( pParent ); + for (sal_Int32 i = 0; i < nCount; ++i ) { SvTreeListEntry* pEntry = m_pTreeListBox->GetEntry( pParent, i ); if ( m_pTreeListBox->IsSelected( pEntry ) ) @@ -908,7 +914,7 @@ namespace accessibility return nSelCount; } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -919,13 +925,13 @@ namespace accessibility throw IndexOutOfBoundsException(); Reference< XAccessible > xChild; - sal_Int32 i, nSelCount = 0, nCount = 0; + sal_Int64 nSelCount = 0; SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath( m_aEntryPath ); if ( !pParent ) throw RuntimeException("AccessibleListBoxEntry::getSelectedAccessibleChild - pParent cannot be empty!"); - nCount = m_pTreeListBox->GetLevelChildCount( pParent ); - for ( i = 0; i < nCount; ++i ) + sal_Int32 nCount = m_pTreeListBox->GetLevelChildCount( pParent ); + for (sal_Int32 i = 0; i < nCount; ++i ) { SvTreeListEntry* pEntry = m_pTreeListBox->GetEntry( pParent, i ); if ( m_pTreeListBox->IsSelected( pEntry ) ) @@ -943,13 +949,16 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); + if (nSelectedChildIndex < 0 || nSelectedChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + SvTreeListEntry* pParent = m_pTreeListBox->GetEntryFromPath( m_aEntryPath ); SvTreeListEntry* pEntry = m_pTreeListBox->GetEntry( pParent, nSelectedChildIndex ); if ( !pEntry ) diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index c1809ade84f0..8d192b9fe277 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -216,7 +216,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBar::getAccessibleChildCount() + sal_Int64 AccessibleTabBar::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -224,7 +224,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -274,11 +274,11 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) + sal_Int64 AccessibleTabBar::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if ( m_pTabBar ) { vcl::Window* pParent = m_pTabBar->GetAccessibleParentWindow(); diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 400530983764..1e9a6d947e9a 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -242,13 +242,13 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() + sal_Int64 AccessibleTabBarPage::getAccessibleChildCount() { return 0; } - Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 ) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int64 ) { OExternalLockGuard aGuard( this ); @@ -264,11 +264,11 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) + sal_Int64 AccessibleTabBarPage::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if ( m_pTabBar ) nIndexInParent = m_pTabBar->GetPagePos( m_nPageId ); diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 6070db1eb95b..fb50211117b7 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -254,7 +254,7 @@ namespace accessibility } else { - for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xChild( getAccessibleChild( i ) ); if ( xChild.is() ) @@ -390,7 +390,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() + sal_Int64 AccessibleTabBarPageList::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -398,7 +398,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -435,7 +435,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) + sal_Int64 AccessibleTabBarPageList::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -602,7 +602,7 @@ namespace accessibility // XAccessibleSelection - void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) + void AccessibleTabBarPageList::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -619,7 +619,7 @@ namespace accessibility } - sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -646,13 +646,13 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) + sal_Int64 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) { return 1; } - Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -661,7 +661,7 @@ namespace accessibility Reference< XAccessible > xChild; - for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ ) + for ( sal_Int64 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; i++ ) { if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { @@ -674,7 +674,7 @@ namespace accessibility } - void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) + void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index e34f1896f307..ef915d08fa01 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -71,7 +71,7 @@ namespace accessibility // XAccessibleContext --------------------------------------------------------- - sal_Int32 SAL_CALL AccessibleTabListBox::getAccessibleChildCount() + sal_Int64 SAL_CALL AccessibleTabListBox::getAccessibleChildCount() { return 2; // header and table } @@ -82,7 +82,7 @@ namespace accessibility } Reference< XAccessible > SAL_CALL - AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex ) + AccessibleTabListBox::getAccessibleChild( sal_Int64 nChildIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 14d48bcad280..fd8c2bb045ed 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -202,9 +202,9 @@ namespace accessibility } // helpers -------------------------------------------------------------------- - void AccessibleTabListBoxTable::ensureValidIndex( sal_Int32 _nIndex ) const + void AccessibleTabListBoxTable::ensureValidIndex( sal_Int64 _nIndex ) const { - if ( ( _nIndex < 0 ) || ( _nIndex >= (implGetRowCount() * implGetColumnCount()) ) ) + if ( ( _nIndex < 0 ) || ( _nIndex >= static_cast<sal_Int64>((implGetRowCount()) * static_cast<sal_Int64>(implGetColumnCount())))) throw IndexOutOfBoundsException(); } @@ -261,7 +261,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) + void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -272,7 +272,7 @@ namespace accessibility implSelectRow( implGetRow( nChildIndex ), true ); } - sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -303,17 +303,17 @@ namespace accessibility m_pTabListBox->SelectAll(); } - sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); - return implGetColumnCount() * implGetSelRowCount(); + return static_cast<sal_Int64>(implGetColumnCount()) * static_cast<sal_Int64>(implGetSelRowCount()); } - Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -329,7 +329,7 @@ namespace accessibility return getAccessibleCellAt( nRow, nColumn ); } - void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index ee5a7ba04b58..99af7273d3f9 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -130,7 +130,7 @@ Paragraph::getAccessibleContext() } // virtual -::sal_Int32 SAL_CALL Paragraph::getAccessibleChildCount() +sal_Int64 SAL_CALL Paragraph::getAccessibleChildCount() { checkDisposed(); return 0; @@ -138,7 +138,7 @@ Paragraph::getAccessibleContext() // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL -Paragraph::getAccessibleChild(::sal_Int32) +Paragraph::getAccessibleChild(sal_Int64) { checkDisposed(); throw css::lang::IndexOutOfBoundsException( @@ -156,7 +156,7 @@ Paragraph::getAccessibleParent() } // virtual -::sal_Int32 SAL_CALL Paragraph::getAccessibleIndexInParent() +sal_Int64 SAL_CALL Paragraph::getAccessibleIndexInParent() { checkDisposed(); return m_xDocument->retrieveParagraphIndex(this); @@ -1308,7 +1308,7 @@ Document::retrieveParagraphRelationSet( Paragraph const * pParagraph ) } // virtual -::sal_Int32 SAL_CALL Document::getAccessibleChildCount() +sal_Int64 SAL_CALL Document::getAccessibleChildCount() { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1317,7 +1317,7 @@ Document::retrieveParagraphRelationSet( Paragraph const * pParagraph ) // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL -Document::getAccessibleChild(::sal_Int32 i) +Document::getAccessibleChild(sal_Int64 i) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1522,7 +1522,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) if (!isAlive()) break; //to enable the PARAGRAPH to get focus for multiline edit - ::sal_Int32 count = getAccessibleChildCount(); + sal_Int64 count = getAccessibleChildCount(); bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1; if ((m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd) || bEmpty) { @@ -1547,7 +1547,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) if (!isAlive()) break; //to enable the PARAGRAPH to get focus for multiline edit - ::sal_Int32 count = getAccessibleChildCount(); + sal_Int64 count = getAccessibleChildCount(); bool bEmpty = m_aFocused == m_aVisibleEnd && count == 1; if ((m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd) || bEmpty) { @@ -2072,7 +2072,7 @@ void Document::handleSelectionChangeNotification() if (xParagraph.is()) { //disable the first event when user types in empty field. - ::sal_Int32 count = getAccessibleChildCount(); + sal_Int64 count = getAccessibleChildCount(); bool bEmpty = count > 1; //if (aIt != m_aFocused) if (aIt != m_aFocused && bEmpty) diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 65d26c199c12..88002f860b10 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -300,13 +300,13 @@ void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i ) } -sal_Int32 OAccessibleMenuBaseComponent::GetChildCount() const +sal_Int64 OAccessibleMenuBaseComponent::GetChildCount() const { return m_aAccessibleChildren.size(); } -Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i ) +Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int64 i ) { Reference< XAccessible > xChild = m_aAccessibleChildren[i]; if ( !xChild.is() ) @@ -351,7 +351,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i ) Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Point& rPoint ) { Reference< XAccessible > xChild; - for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index d7ee80027579..7bc5f2c6f538 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -135,7 +135,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseC // XAccessibleContext -sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() +sal_Int64 OAccessibleMenuComponent::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -143,7 +143,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() } -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -334,7 +334,7 @@ OUString OAccessibleMenuComponent::getToolTipText( ) // XAccessibleSelection -void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) +void OAccessibleMenuComponent::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -345,7 +345,7 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -370,13 +370,13 @@ void OAccessibleMenuComponent::selectAllAccessibleChildren( ) } -sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) +sal_Int64 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; - for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ ) + for ( sal_Int64 i = 0, nCount = GetChildCount(); i < nCount; i++ ) { if ( IsChildSelected( i ) ) ++nRet; @@ -386,7 +386,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) } -Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -395,7 +395,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s Reference< XAccessible > xChild; - for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ ) + for ( sal_Int64 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ ) { if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { @@ -408,7 +408,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s } -void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) +void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 074cd0bdc531..9ffcc2313a4c 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -287,7 +287,7 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing() // XAccessibleContext -sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() +sal_Int64 OAccessibleMenuItemComponent::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -295,7 +295,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() } -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -314,7 +314,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) } -sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) +sal_Int64 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 91fc9191c00f..9df75a914751 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -260,7 +260,7 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext //===== XAccessibleContext ================================================== -sal_Int32 VCLXAccessibleBox::getAccessibleChildCount() +sal_Int64 VCLXAccessibleBox::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -268,12 +268,12 @@ sal_Int32 VCLXAccessibleBox::getAccessibleChildCount() return implGetAccessibleChildCount(); } -sal_Int32 VCLXAccessibleBox::implGetAccessibleChildCount() +sal_Int64 VCLXAccessibleBox::implGetAccessibleChildCount() { // Usually a box has a text field and a list of items as its children. // Non drop down list boxes have no text field. Additionally check // whether the object is valid. - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; if (IsValid()) nCount += (m_bHasTextChild?1:0) + (m_bHasListChild?1:0); else @@ -288,7 +288,7 @@ sal_Int32 VCLXAccessibleBox::implGetAccessibleChildCount() return nCount; } -Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 i) +Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int64 i) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -450,7 +450,7 @@ Any VCLXAccessibleBox::getCurrentValue( ) { if(pList->getSelectedAccessibleChildCount()>0) { - Reference<XAccessibleContext> xName (pList->getSelectedAccessibleChild(sal_Int32(0)), UNO_QUERY); + Reference<XAccessibleContext> xName (pList->getSelectedAccessibleChild(sal_Int64(0)), UNO_QUERY); if(xName.is()) { aAny <<= xName->getAccessibleName(); diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index dc2a39acbf56..d01a6b193b13 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -187,7 +187,7 @@ Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() // XAccessibleContext -sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() +sal_Int64 VCLXAccessibleEdit::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -195,7 +195,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() } -Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 ) +Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int64 ) { throw IndexOutOfBoundsException(); } diff --git a/accessibility/source/standard/vclxaccessibleheaderbar.cxx b/accessibility/source/standard/vclxaccessibleheaderbar.cxx index de5208b351de..23d2db4be3d8 100644 --- a/accessibility/source/standard/vclxaccessibleheaderbar.cxx +++ b/accessibility/source/standard/vclxaccessibleheaderbar.cxx @@ -56,18 +56,18 @@ Sequence<OUString> VCLXAccessibleHeaderBar::getSupportedServiceNames() // =======XAccessibleContext======= -sal_Int32 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount() +sal_Int64 SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChildCount() { SolarMutexGuard g; - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; if (m_pHeadBar) nCount = m_pHeadBar->GetItemCount(); return nCount; } css::uno::Reference<css::accessibility::XAccessible> - SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChild(sal_Int32 i) + SAL_CALL VCLXAccessibleHeaderBar::getAccessibleChild(sal_Int64 i) { SolarMutexGuard g; diff --git a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx index 18abc095b0d8..3ca7b6987c4b 100644 --- a/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx +++ b/accessibility/source/standard/vclxaccessibleheaderbaritem.cxx @@ -118,13 +118,13 @@ Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContex // XAccessibleContext -sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() +sal_Int64 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() { return 0; } -Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -149,7 +149,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() } -sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() +sal_Int64 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() { OExternalLockGuard aGuard( this ); return m_nIndexInParent - 1; diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 6d491b4550ec..66cb69f97ebf 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -43,7 +43,7 @@ using namespace ::accessibility; namespace { /// @throws css::lang::IndexOutOfBoundsException - void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected ) + void checkSelection_Impl( sal_Int64 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected ) { sal_Int32 nCount = bSelected ? _rListBox.GetSelectedEntryCount() : _rListBox.GetEntryCount(); @@ -520,14 +520,14 @@ Reference<XAccessibleContext> SAL_CALL // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount() +sal_Int64 SAL_CALL VCLXAccessibleList::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); return implGetAccessibleChildCount(); } -sal_Int32 VCLXAccessibleList::implGetAccessibleChildCount() +sal_Int64 VCLXAccessibleList::implGetAccessibleChildCount() { sal_Int32 nCount = 0; if ( m_pListBoxHelper ) @@ -536,7 +536,7 @@ sal_Int32 VCLXAccessibleList::implGetAccessibleChildCount() return nCount; } -Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i) +Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int64 i) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -565,7 +565,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) return m_xParent; } -sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent() +sal_Int64 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent() { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) return m_nIndexInParent; @@ -723,7 +723,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_Int32) // XAccessibleSelection -void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int64 nChildIndex ) { bool bNotify = false; @@ -748,7 +748,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) UpdateSelection_Impl(); } -sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -807,18 +807,18 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) UpdateSelection_Impl(); } -sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) +sal_Int64 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; if ( m_pListBoxHelper ) nCount = m_pListBoxHelper->GetSelectedEntryCount(); return nCount; } -Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -832,7 +832,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild return nullptr; } -void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) +void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { bool bNotify = false; diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index d9792724dc88..b7d7d9f50d79 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -192,12 +192,12 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleCo // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) +sal_Int64 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) { return 0; } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int64 ) { return Reference< XAccessible >(); } @@ -209,7 +209,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( return m_xParent; } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) +sal_Int64 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index a7e31094b668..9aba762da209 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -90,7 +90,7 @@ Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() // XAccessibleContext -sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) +sal_Int64 VCLXAccessibleMenu::getAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -98,7 +98,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) } -Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -131,7 +131,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Po // XAccessibleSelection -void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) +void VCLXAccessibleMenu::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -142,7 +142,7 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -167,18 +167,18 @@ void VCLXAccessibleMenu::selectAllAccessibleChildren( ) } -sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) +sal_Int64 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); return implGetSelectedAccessibleChildCount(); } -sal_Int32 VCLXAccessibleMenu::implGetSelectedAccessibleChildCount( ) +sal_Int64 VCLXAccessibleMenu::implGetSelectedAccessibleChildCount( ) { - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; - for ( sal_Int32 i = 0, nCount = GetChildCount(); i < nCount; i++ ) + for ( sal_Int64 i = 0, nCount = GetChildCount(); i < nCount; i++ ) { if ( IsChildSelected( i ) ) ++nRet; @@ -187,7 +187,7 @@ sal_Int32 VCLXAccessibleMenu::implGetSelectedAccessibleChildCount( ) return nRet; } -Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -196,7 +196,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int Reference< XAccessible > xChild; - for ( sal_Int32 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ ) + for ( sal_Int64 i = 0, j = 0, nCount = GetChildCount(); i < nCount; i++ ) { if ( IsChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { @@ -209,7 +209,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int } -void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) +void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 27a02607b225..13d1e1db62da 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -134,11 +134,11 @@ Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() // XAccessibleContext -sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if ( m_pMenu ) { diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index ad3e7441e3e1..a937776b3cce 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -54,7 +54,7 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() // XAccessibleContext -sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index d6e3e0ef5cad..05b061a5f76b 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -160,7 +160,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind if ( m_pStatusBar ) { sal_uInt16 nItemId = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData())); - for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xChild( getAccessibleChild( i ) ); if ( xChild.is() ) @@ -279,7 +279,7 @@ Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() // XAccessibleContext -sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() +sal_Int64 VCLXAccessibleStatusBar::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -287,7 +287,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() } -Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index a643c92f35e2..0bbefc103caf 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -235,7 +235,7 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex // XAccessibleContext -sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() +sal_Int64 VCLXAccessibleStatusBarItem::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -243,7 +243,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() } -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 ) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int64 ) { throw IndexOutOfBoundsException(); } @@ -261,11 +261,11 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) } -sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if ( m_pStatusBar ) nIndexInParent = m_pStatusBar->GetItemPos( m_nItemId ); diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 994ad92c13fb..f44b58a760c9 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -199,7 +199,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin if ( m_pTabControl ) { sal_uInt16 nPageId = static_cast<sal_uInt16>(reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData())); - for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xChild( getAccessibleChild( i ) ); if ( xChild.is() ) @@ -343,7 +343,7 @@ Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() // XAccessibleContext -sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() +sal_Int64 VCLXAccessibleTabControl::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -351,7 +351,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() } -Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -361,7 +361,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 return implGetAccessibleChild( i ); } -Reference< XAccessible > VCLXAccessibleTabControl::implGetAccessibleChild( sal_Int32 i ) +Reference< XAccessible > VCLXAccessibleTabControl::implGetAccessibleChild( sal_Int64 i ) { Reference< XAccessible > xChild = m_aAccessibleChildren[i]; if ( !xChild.is() ) @@ -399,7 +399,7 @@ OUString VCLXAccessibleTabControl::getAccessibleName( ) // XAccessibleSelection -void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) +void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -411,7 +411,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -443,7 +443,7 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) } -sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) +sal_Int64 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -451,7 +451,7 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) } -Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -473,7 +473,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s } -void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) +void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 9786b2f761fd..5d4f94b7970b 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -277,15 +277,15 @@ Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) // XAccessibleContext -sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() +sal_Int64 VCLXAccessibleTabPage::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); return implGetAccessibleChildCount(); } -sal_Int32 VCLXAccessibleTabPage::implGetAccessibleChildCount() +sal_Int64 VCLXAccessibleTabPage::implGetAccessibleChildCount() { - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; if ( m_pTabControl ) { TabPage* pTabPage = m_pTabControl->GetTabPage( m_nPageId ); @@ -297,7 +297,7 @@ sal_Int32 VCLXAccessibleTabPage::implGetAccessibleChildCount() } -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -328,11 +328,11 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) } -sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if ( m_pTabControl ) nIndexInParent = m_pTabControl->GetPagePos( m_nPageId ); @@ -411,7 +411,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt: OExternalLockGuard aGuard( this ); Reference< XAccessible > xChild; - for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index c8408d24be97..7eae8cf90be2 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -122,7 +122,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) } -sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index c94e46e3d5ed..dd5f542f2fc7 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -63,13 +63,13 @@ Reference<XAccessibleContext> SAL_CALL // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount() +sal_Int64 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount() { return 0; } -Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int32) +Reference<XAccessible> SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int64) { throw IndexOutOfBoundsException(); } diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 779f92e36aff..4ef03cd1efe3 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -64,11 +64,11 @@ namespace ,m_nIndexInParent(_nIndexInParent) { } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override; }; - sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; @@ -350,7 +350,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( ToolBox::ImplToolItems::size_type _ // TODO: we should make this dependent on the existence of event listeners // with the current implementation, we always create accessible object - Any aNewChild( getAccessibleChild( static_cast<sal_Int32>(_nPos) ) ); + Any aNewChild( getAccessibleChild( static_cast<sal_Int64>(_nPos) ) ); //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewChild ); } @@ -374,8 +374,7 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl() for ( i = 0; i < nCount; ++i ) { Any aNewValue; - aNewValue <<= getAccessibleChild( static_cast<sal_Int32>(i) ); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! + aNewValue <<= getAccessibleChild(i); NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue ); } } @@ -395,8 +394,7 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( vcl::Window* pWindow, b Reference< XAccessible > xChild( pWindow->GetAccessible() ); if( xChild.is() ) { - Reference< XAccessible > xChildItem( getAccessibleChild( static_cast< sal_Int32 >( pToolBox->GetItemPos( nDownItem ) ) ) ); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! + Reference< XAccessible > xChildItem( getAccessibleChild(pToolBox->GetItemPos(nDownItem))); VCLXAccessibleToolBoxItem* pItem = static_cast< VCLXAccessibleToolBoxItem* >( xChildItem.get() ); pItem->SetChild( xChild ); @@ -436,7 +434,6 @@ void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWin ToolBox::ImplToolItems::size_type nIndex = pToolBox->GetItemPos( nCurItemId ); Reference< XAccessible > xItem = getAccessibleChild( nIndex ); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! if ( xItem.is() ) { Reference< XAccessible > xChild = pChildWindow->GetAccessible(); @@ -458,7 +455,6 @@ void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox ) return; // not found Reference< XAccessible > xItem = getAccessibleChild( nIndex ); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! if ( !xItem.is() ) return; @@ -558,7 +554,6 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow Any aNewValue; aNewValue <<= getAccessibleChild(nPos); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue ); break; } @@ -662,24 +657,23 @@ Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) +sal_Int64 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) { comphelper::OExternalLockGuard aGuard( this ); return implGetAccessibleChildCount(); } - sal_Int32 VCLXAccessibleToolBox::implGetAccessibleChildCount( ) + sal_Int64 VCLXAccessibleToolBox::implGetAccessibleChildCount( ) { - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; VclPtr< ToolBox > pToolBox = GetAs< ToolBox >(); if ( pToolBox ) nCount = pToolBox->GetItemCount(); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! return nCount; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int64 i ) { comphelper::OExternalLockGuard aGuard( this ); @@ -732,7 +726,6 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c ToolBox::ImplToolItems::size_type nItemPos = pToolBox->GetItemPos( VCLPoint( _rPoint ) ); if ( nItemPos != ToolBox::ITEM_NOTFOUND ) xAccessible = getAccessibleChild( nItemPos ); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! } return xAccessible; @@ -752,7 +745,6 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V vcl::Window* pItemWindow = pToolBox->GetItemWindow( nItemId ); if ( pItemWindow == pChildWindow ) xReturn = getAccessibleChild(i); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32! } } return xReturn; @@ -768,7 +760,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWin } // XAccessibleSelection -void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) +void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -779,7 +771,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) pToolBox->ChangeHighlight( nChildIndex ); } -sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); VclPtr< ToolBox > pToolBox = GetAs< ToolBox >(); @@ -805,11 +797,11 @@ void VCLXAccessibleToolBox::selectAllAccessibleChildren( ) // intentionally empty. makes no sense for a toolbox } -sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) +sal_Int64 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; VclPtr< ToolBox > pToolBox = GetAs< ToolBox >(); if (pToolBox) { @@ -827,7 +819,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) return nRet; } -Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); if ( nSelectedChildIndex != 0 ) @@ -838,7 +830,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_ if (pToolBox) { ToolBoxItemId nHighlightItemId = pToolBox->GetHighlightItemId(); - for ( sal_Int32 i = 0, nCount = pToolBox->GetItemCount(); i < nCount; i++ ) + for (ToolBox::ImplToolItems::size_type i = 0, nCount = pToolBox->GetItemCount(); i < nCount; i++ ) { if ( nHighlightItemId == pToolBox->GetItemId( i ) ) { @@ -854,7 +846,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_ return xChild; } -void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) +void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= implGetAccessibleChildCount() ) diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index c5d92517b726..c7b49af7de17 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -312,14 +312,14 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibl // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) +sal_Int64 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) { OContextEntryGuard aGuard( this ); return m_xChild.is() ? 1 : 0; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int64 i ) { OContextEntryGuard aGuard( this ); @@ -337,7 +337,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent return m_pToolBox->GetAccessible(); } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) +sal_Int64 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) { OContextEntryGuard aGuard( this ); diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 2ed61dc55233..e6f75045af8c 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -304,13 +304,13 @@ Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleConte } // XAccessibleContext -sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() +sal_Int64 AccessibleDialogControlShape::getAccessibleChildCount() { return 0; } -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -333,18 +333,18 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) } -sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) +sal_Int64 AccessibleDialogControlShape::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; Reference< XAccessible > xParent( getAccessibleParent() ); if ( xParent.is() ) { Reference< XAccessibleContext > xParentContext( xParent->getAccessibleContext() ); if ( xParentContext.is() ) { - for ( sal_Int32 i = 0, nCount = xParentContext->getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = xParentContext->getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xChild( xParentContext->getAccessibleChild( i ) ); if ( xChild.is() ) diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 1d240ece0513..54e3743b5332 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -554,7 +554,7 @@ Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) } // XAccessibleContext -sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() +sal_Int64 AccessibleDialogWindow::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -562,7 +562,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() } -Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -605,11 +605,11 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) } -sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) +sal_Int64 AccessibleDialogWindow::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if ( m_pDialogWindow ) { vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow(); @@ -830,7 +830,7 @@ OUString AccessibleDialogWindow::getToolTipText( ) // XAccessibleSelection -void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) +void AccessibleDialogWindow::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -849,7 +849,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -881,13 +881,13 @@ void AccessibleDialogWindow::selectAllAccessibleChildren( ) } -sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) +sal_Int64 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; - for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { if ( isAccessibleChildSelected( i ) ) ++nRet; @@ -897,7 +897,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) } -Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -906,7 +906,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal Reference< XAccessible > xChild; - for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) ) { @@ -919,7 +919,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal } -void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) +void AccessibleDialogWindow::deselectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index f43f29280eeb..9882bac5ba63 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -100,10 +100,10 @@ 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; diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 712d58158a0a..dffd8ea8f550 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -114,10 +114,10 @@ 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; @@ -137,13 +137,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 diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 66e92abeac1d..5ba72c5dbec6 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -434,7 +434,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext() } // ________ AccessibleBase::XAccessibleContext ________ -sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleBase::getAccessibleChildCount() { ClearableMutexGuard aGuard( m_aMutex ); if( ! m_bMayHaveChildren || @@ -453,12 +453,12 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() return ImplGetAccessibleChildCount(); } -sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const +sal_Int64 AccessibleBase::ImplGetAccessibleChildCount() const { return m_aChildList.size(); } -Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int64 i ) { CheckDisposeState(); Reference< XAccessible > xResult; @@ -477,7 +477,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 return xResult; } -Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const +Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int64 i ) const { Reference< XAccessible > xResult; @@ -510,7 +510,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() return aResult; } -sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleBase::getAccessibleIndexInParent() { CheckDisposeState(); diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index 4a4e0cd637df..8b37b002d76d 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -115,7 +115,7 @@ void AccessibleChartElement::InitTextEdit() // Interfaces // ________ AccessibleBase::XAccessibleContext ________ -Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const +Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int64 i ) const { Reference< XAccessible > xResult; @@ -127,7 +127,7 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal return xResult; } -sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const +sal_Int64 AccessibleChartElement::ImplGetAccessibleChildCount() const { if( m_bHasText ) { diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 12982db8faa1..944aa5fa822a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -61,8 +61,8 @@ public: // ________ AccessibleBase ________ virtual bool ImplUpdateChildren() override; virtual css::uno::Reference< css::accessibility::XAccessible > - ImplGetAccessibleChildById( sal_Int32 i ) const override; - virtual sal_Int32 ImplGetAccessibleChildCount() const override; + ImplGetAccessibleChildById( sal_Int64 i ) const override; + virtual sal_Int64 ImplGetAccessibleChildCount() const override; // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleName() override; diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 73ff2e9c0ca8..771698a84010 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -78,9 +78,9 @@ OUString AccessibleChartShape::getImplementationName() } // ________ XAccessibleContext ________ -sal_Int32 AccessibleChartShape::getAccessibleChildCount() +sal_Int64 AccessibleChartShape::getAccessibleChildCount() { - sal_Int32 nCount(0); + sal_Int64 nCount(0); if ( m_pAccShape.is() ) { nCount = m_pAccShape->getAccessibleChildCount(); @@ -88,7 +88,7 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount() return nCount; } -Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int64 i ) { Reference< XAccessible > xChild; if ( m_pAccShape.is() ) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index 4377929fa41d..c31204ed3c8a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -50,9 +50,9 @@ public: virtual OUString SAL_CALL getImplementationName() override; // ________ XAccessibleContext ________ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; + getAccessibleChild( sal_Int64 i ) override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; virtual OUString SAL_CALL getAccessibleDescription() override; virtual OUString SAL_CALL getAccessibleName() override; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 6f9dad562840..2b96c684ff43 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -112,7 +112,7 @@ Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent() return Reference< XAccessible >( m_xParent ); } -sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleChartView::getAccessibleIndexInParent() { // the document is always the only child of the window return 0; diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index e5d294c69cab..42cddcd36832 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -95,7 +95,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg } // ____ XAccessibleContext ____ -::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleTextHelper::getAccessibleChildCount() { if( m_pTextHelper ) { @@ -105,7 +105,7 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg return 0; } -Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i ) +Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( sal_Int64 i ) { if( m_pTextHelper ) { @@ -121,7 +121,7 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent() return Reference< XAccessible >(); } -::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent() { OSL_FAIL( "Not implemented in this helper" ); return -1; diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 274e4436319c..58e122e8a2d2 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -204,14 +204,14 @@ protected: @throws css::uno::RuntimeException */ virtual css::uno::Reference< css::accessibility::XAccessible > - ImplGetAccessibleChildById( sal_Int32 i ) const; + ImplGetAccessibleChildById( sal_Int64 i ) const; /** Is called from getAccessibleChildCount(). Before this method is called, an update of children is done if necessary. @throws css::uno::RuntimeException */ - virtual sal_Int32 ImplGetAccessibleChildCount() const; + virtual sal_Int64 ImplGetAccessibleChildCount() const; const AccessibleElementInfo& GetInfo() const { return m_aAccInfo;} void SetInfo( const AccessibleElementInfo & rNewInfo ); @@ -224,12 +224,12 @@ protected: virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; // ________ XAccessibleContext ________ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; + 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; /// @return AccessibleRole.SHAPE virtual sal_Int16 SAL_CALL getAccessibleRole() override; // has to be implemented by derived classes diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index eb3367b205d6..3e1217d67233 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -79,7 +79,7 @@ public: // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleDescription() 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 OUString SAL_CALL getAccessibleName() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 4b6ba4037e6e..b73a62b428cd 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -66,11 +66,11 @@ public: const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ____ XAccessibleContext ____ - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( - ::sal_Int32 i ) override; + 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/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index ad2c63b1a1c0..854b3966036e 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -171,12 +171,12 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; try { @@ -198,8 +198,8 @@ namespace comphelper if ( xCreator.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for ( sal_Int32 nChild = 0; ( nChild < nChildCount ) && ( -1 == nRet ); ++nChild ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for ( sal_Int64 nChild = 0; ( nChild < nChildCount ) && ( -1 == nRet ); ++nChild ) { Reference< XAccessible > xChild( xParentContext->getAccessibleChild( nChild ) ); if ( xChild.get() == xCreator.get() ) diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index 967c1b079e48..97b75115e5e6 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -36,13 +36,13 @@ namespace comphelper OCommonAccessibleSelection::~OCommonAccessibleSelection() {} - void OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) + void OCommonAccessibleSelection::selectAccessibleChild( sal_Int64 nChildIndex ) { implSelect( nChildIndex, true ); } - bool OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) + bool OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int64 nChildIndex ) { return implIsSelected( nChildIndex ); } @@ -60,16 +60,16 @@ namespace comphelper } - sal_Int32 OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) + sal_Int64 OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) { - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); OSL_ENSURE( xParentContext.is(), "OCommonAccessibleSelection::getSelectedAccessibleChildCount: no parent context!" ); if( xParentContext.is() ) { - for( sal_Int32 i = 0, nChildCount = xParentContext->getAccessibleChildCount(); i < nChildCount; i++ ) + for( sal_Int64 i = 0, nChildCount = xParentContext->getAccessibleChildCount(); i < nChildCount; i++ ) if( implIsSelected( i ) ) ++nRet; } @@ -78,7 +78,7 @@ namespace comphelper } - Reference< XAccessible > OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { Reference< XAccessible > xRet; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -87,7 +87,7 @@ namespace comphelper if( xParentContext.is() ) { - for( sal_Int32 i = 0, nChildCount = xParentContext->getAccessibleChildCount(), nPos = 0; ( i < nChildCount ) && !xRet.is(); i++ ) + for( sal_Int64 i = 0, nChildCount = xParentContext->getAccessibleChildCount(), nPos = 0; ( i < nChildCount ) && !xRet.is(); i++ ) if( implIsSelected( i ) && ( nPos++ == nSelectedChildIndex ) ) xRet = xParentContext->getAccessibleChild( i ); } @@ -96,7 +96,7 @@ namespace comphelper } - void OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void OCommonAccessibleSelection::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { implSelect( nSelectedChildIndex, false ); } @@ -117,14 +117,14 @@ namespace comphelper } - void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) + void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ); @@ -145,21 +145,21 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) + sal_Int64 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::getSelectedAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ); } - void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index c99aec3a9067..af5cd50a378b 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -388,13 +388,13 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base ) - sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) + sal_Int64 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) { return m_xInnerContext->getAccessibleChildCount(); } - Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) + Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int64 i ) { // get the child of the wrapped component Reference< XAccessible > xInnerChild = m_xInnerContext->getAccessibleChild( i ); @@ -494,13 +494,13 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) + sal_Int64 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) { return baseGetAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int64 i ) { return baseGetAccessibleChild( i ); } @@ -512,7 +512,7 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) { return m_xInnerContext->getAccessibleIndexInParent(); } diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index a9254fac33c9..f2620f645eab 100644 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -166,7 +166,7 @@ public class CopyTableWizard extends CRMBasedTestCase final UITools uiTools = new UITools(dialog); final XAccessible root = uiTools.getRoot(); final XAccessibleContext accContext = root.getAccessibleContext(); - final int count = accContext.getAccessibleChildCount(); + final long count = accContext.getAccessibleChildCount(); String buttonName = "Create"; final XAccessibleContext childContext = accContext.getAccessibleChild(count - 3).getAccessibleContext(); final String name = childContext.getAccessibleName(); diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 1652b8b0b53c..ebbfee97d435 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -66,9 +66,9 @@ namespace dbaui 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; diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 3a630faa2bca..4416f42d6292 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -50,8 +50,8 @@ namespace dbaui 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 sal_Int16 SAL_CALL getAccessibleRole( ) override; void notifyAccessibleEvent( diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index b51e4c80f4b8..860c47ba178b 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -38,7 +38,7 @@ namespace dbaui { VclPtr<OTableWindow> m_pTable; // the window which I should give accessibility to - css::uno::Reference< css::accessibility::XAccessible > getParentChild(sal_Int32 _nIndex); + css::uno::Reference< css::accessibility::XAccessible > getParentChild(sal_Int64 _nIndex); protected: /** this function is called upon disposing the component */ @@ -70,9 +70,9 @@ namespace dbaui 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 getAccessibleName( ) override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 85dc65276861..9ba41e4501f7 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -59,18 +59,18 @@ namespace dbaui return "org.openoffice.comp.dbu.ConnectionLineAccessibility"; } // XAccessibleContext - sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleChildCount( ) + sal_Int64 SAL_CALL OConnectionLineAccess::getAccessibleChildCount( ) { return 0; } - Reference< XAccessible > SAL_CALL OConnectionLineAccess::getAccessibleChild( sal_Int32 /*i*/ ) + Reference< XAccessible > SAL_CALL OConnectionLineAccess::getAccessibleChild( sal_Int64 /*i*/ ) { return Reference< XAccessible >(); } - sal_Int32 SAL_CALL OConnectionLineAccess::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL OConnectionLineAccess::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); - sal_Int32 nIndex = -1; + sal_Int64 nIndex = -1; if( m_pLine ) { // search the position of our table window in the table window map diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 8068f0fa7f21..e39bf4a563dd 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -47,17 +47,17 @@ namespace dbaui m_pTableView = nullptr; } // XAccessibleContext - sal_Int32 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount( ) + sal_Int64 SAL_CALL OJoinDesignViewAccess::getAccessibleChildCount( ) { // TODO may be this will change to only visible windows // this is the same assumption mt implements ::osl::MutexGuard aGuard( m_aMutex ); - sal_Int32 nChildCount = 0; + sal_Int64 nChildCount = 0; if ( m_pTableView ) nChildCount = m_pTableView->GetTabWinCount() + m_pTableView->getTableConnections().size(); return nChildCount; } - Reference< XAccessible > SAL_CALL OJoinDesignViewAccess::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > SAL_CALL OJoinDesignViewAccess::getAccessibleChild( sal_Int64 i ) { Reference< XAccessible > aRet; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 787d257b59e1..826cf22c7629 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -74,10 +74,10 @@ namespace dbaui "com.sun.star.accessibility.AccessibleContext" }; } // XAccessibleContext - sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleChildCount( ) + sal_Int64 SAL_CALL OTableWindowAccess::getAccessibleChildCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; if(m_pTable) { ++nCount; @@ -86,7 +86,7 @@ namespace dbaui } return nCount; } - Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleChild( sal_Int32 i ) + Reference< XAccessible > SAL_CALL OTableWindowAccess::getAccessibleChild( sal_Int64 i ) { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XAccessible > aRet; @@ -114,10 +114,10 @@ namespace dbaui } return aRet; } - sal_Int32 SAL_CALL OTableWindowAccess::getAccessibleIndexInParent( ) + sal_Int64 SAL_CALL OTableWindowAccess::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); - sal_Int32 nIndex = -1; + sal_Int64 nIndex = -1; if( m_pTable ) { // search the position of our table window in the table window map @@ -160,7 +160,7 @@ namespace dbaui } return aRet; } - Reference< XAccessible > OTableWindowAccess::getParentChild(sal_Int32 _nIndex) + Reference< XAccessible > OTableWindowAccess::getParentChild(sal_Int64 _nIndex) { Reference< XAccessible > xReturn; Reference< XAccessible > xParent = getAccessibleParent(); diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index b54509a3e845..2b6d08bfa842 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -163,7 +163,7 @@ uno::Reference< XAccessibleContext> SAL_CALL /** No children. */ -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleContextBase::getAccessibleChildCount() { return 0; @@ -174,7 +174,7 @@ sal_Int32 SAL_CALL an exception for a wrong index. */ uno::Reference<XAccessible> SAL_CALL - AccessibleContextBase::getAccessibleChild (sal_Int32 nIndex) + AccessibleContextBase::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); throw lang::IndexOutOfBoundsException ( @@ -191,7 +191,7 @@ uno::Reference<XAccessible> SAL_CALL } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleContextBase::getAccessibleIndexInParent() { ThrowIfDisposed (); @@ -207,8 +207,8 @@ sal_Int32 SAL_CALL mxParent->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for (sal_Int32 i=0; i<nChildCount; i++) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for (sal_Int64 i=0; i<nChildCount; i++) { uno::Reference<XAccessible> xChild (xParentContext->getAccessibleChild (i)); if (xChild.is()) diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index a2603b665067..aacb01522f51 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -640,14 +640,14 @@ namespace accessibility } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() + sal_Int64 SAL_CALL AccessibleEditableTextPara::getAccessibleChildCount() { SolarMutexGuard aGuard; return HaveChildren() ? 1 : 0; } - uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int32 i ) + uno::Reference< XAccessible > SAL_CALL AccessibleEditableTextPara::getAccessibleChild( sal_Int64 i ) { SolarMutexGuard aGuard; @@ -685,7 +685,7 @@ namespace accessibility return mxParent; } - sal_Int32 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() + sal_Int64 SAL_CALL AccessibleEditableTextPara::getAccessibleIndexInParent() { return mnIndexInParent; } diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index 8a9f58b7fa75..58ac8f989561 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.cxx @@ -97,13 +97,13 @@ namespace accessibility return uno::Reference< XAccessibleContext > ( this ); } - sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleChildCount() + sal_Int64 SAL_CALL AccessibleImageBullet::getAccessibleChildCount() { return 0; } - uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleChild( sal_Int32 ) + uno::Reference< XAccessible > SAL_CALL AccessibleImageBullet::getAccessibleChild( sal_Int64 ) { throw lang::IndexOutOfBoundsException("No children available", uno::Reference< uno::XInterface > @@ -116,7 +116,7 @@ namespace accessibility return mxParent; } - sal_Int32 SAL_CALL AccessibleImageBullet::getAccessibleIndexInParent() + sal_Int64 SAL_CALL AccessibleImageBullet::getAccessibleIndexInParent() { return mnIndexInParent; diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx b/editeng/source/accessibility/AccessibleImageBullet.hxx index 52a48dbd0ddb..97fd98cae796 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.hxx +++ b/editeng/source/accessibility/AccessibleImageBullet.hxx @@ -57,10 +57,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; virtual OUString SAL_CALL getAccessibleDescription() override; virtual OUString SAL_CALL getAccessibleName() override; diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx index 09975c9ecab0..e70b61840822 100644 --- a/editeng/source/accessibility/AccessibleSelectionBase.cxx +++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx @@ -39,14 +39,14 @@ namespace accessibility } - void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) + void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int64 nChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) + sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int64 nChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); return OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ); @@ -67,21 +67,21 @@ namespace accessibility } - sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) + sal_Int64 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount( ) { ::osl::MutexGuard aGuard( implGetMutex() ); return OCommonAccessibleSelection::getSelectedAccessibleChildCount(); } - uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); return OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ); } - void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { ::osl::MutexGuard aGuard( implGetMutex() ); OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex ); diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx index 9e73d192b19a..93fcb9e997e4 100644 --- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx +++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx @@ -465,13 +465,13 @@ namespace accessibility } // XAccessibleContext - sal_Int32 AccessibleStaticTextBase::getAccessibleChildCount() + sal_Int64 AccessibleStaticTextBase::getAccessibleChildCount() { // no children at all return 0; } - uno::Reference< XAccessible > AccessibleStaticTextBase::getAccessibleChild( sal_Int32 /*i*/ ) + uno::Reference< XAccessible > AccessibleStaticTextBase::getAccessibleChild( sal_Int64 /*i*/ ) { // no children at all return uno::Reference< XAccessible >(); 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; diff --git a/offapi/com/sun/star/accessibility/XAccessibleContext.idl b/offapi/com/sun/star/accessibility/XAccessibleContext.idl index deab36ea4f08..84c8a21cfdea 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleContext.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleContext.idl @@ -46,7 +46,7 @@ interface XAccessibleContext : ::com::sun::star::uno::XInterface @return The returned value is non-negative. */ - long getAccessibleChildCount(); + hyper getAccessibleChildCount(); /** Returns the i-th child of this object. @@ -67,7 +67,7 @@ interface XAccessibleContext : ::com::sun::star::uno::XInterface ::com::sun::star::lang::IndexOutOfBoundsException exception is thrown. */ - XAccessible getAccessibleChild ([in] long i) + XAccessible getAccessibleChild ([in] hyper i) raises (::com::sun::star::lang::IndexOutOfBoundsException); /** Returns the parent of this object. @@ -91,7 +91,7 @@ interface XAccessibleContext : ::com::sun::star::uno::XInterface @return The returned index is zero based. */ - long getAccessibleIndexInParent (); + hyper getAccessibleIndexInParent (); /** Returns the role of this object. diff --git a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl index 6227f6634159..206d552ee259 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleSelection.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleSelection.idl @@ -53,7 +53,7 @@ interface XAccessibleSelection : ::com::sun::star::uno::XInterface the result of XAccessibleContext::getAccessibleChildCount()-1. */ - void selectAccessibleChild ([in] long nChildIndex) + void selectAccessibleChild ([in] hyper nChildIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); /** Determines if the specified child of this object is selected. @@ -70,7 +70,7 @@ interface XAccessibleSelection : ::com::sun::star::uno::XInterface the result of XAccessibleContext::getAccessibleChildCount()-1. */ - boolean isAccessibleChildSelected ([in] long nChildIndex) + boolean isAccessibleChildSelected ([in] hyper nChildIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); /** Clears the selection, so that no children of the @@ -98,7 +98,7 @@ interface XAccessibleSelection : ::com::sun::star::uno::XInterface Returns the number of selected children of this object or 0 if no child is selected. */ - long getSelectedAccessibleChildCount (); + hyper getSelectedAccessibleChildCount (); /** Returns the specified selected Accessible child. @@ -119,7 +119,7 @@ interface XAccessibleSelection : ::com::sun::star::uno::XInterface the result of XAccessibleRelationSet::getAccessibleChildCount()-1. */ - XAccessible getSelectedAccessibleChild ([in] long nSelectedChildIndex) + XAccessible getSelectedAccessibleChild ([in] hyper nSelectedChildIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); /** Removes the specified child from the set of this object's @@ -136,7 +136,7 @@ interface XAccessibleSelection : ::com::sun::star::uno::XInterface but not including, the result of XAccessibleContext::getAccessibleChildCount(). */ - void deselectAccessibleChild ([in] long nChildIndex) + void deselectAccessibleChild ([in] hyper nChildIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); }; diff --git a/offapi/com/sun/star/accessibility/XAccessibleTable.idl b/offapi/com/sun/star/accessibility/XAccessibleTable.idl index 2a3e19b88ae8..0fd06cbad8c8 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleTable.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleTable.idl @@ -325,7 +325,7 @@ interface XAccessibleTable : ::com::sun::star::uno::XInterface Child index of the specified accessible object or -1 if one or both of the given indices is/are invalid. */ - long getAccessibleIndex ([in] long nRow, [in] long nColumn) + hyper getAccessibleIndex ([in] long nRow, [in] long nColumn) raises (::com::sun::star::lang::IndexOutOfBoundsException); /** Translate the given child index into the corresponding row @@ -342,7 +342,7 @@ interface XAccessibleTable : ::com::sun::star::uno::XInterface @throws ::com::sun::star::lang::IndexOutOfBoundsException if nChildIndex addresses an invalid row. */ - long getAccessibleRow ([in] long nChildIndex) + long getAccessibleRow ([in] hyper nChildIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); /** Translate the given child index into the corresponding column @@ -360,7 +360,7 @@ interface XAccessibleTable : ::com::sun::star::uno::XInterface @throws ::com::sun::star::lang::IndexOutOfBoundsException if nChildIndex addresses an invalid column. */ - long getAccessibleColumn ([in] long nChildIndex) + long getAccessibleColumn ([in] hyper nChildIndex) raises (::com::sun::star::lang::IndexOutOfBoundsException); }; diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index 562c03e67b41..672754d80f1a 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -103,13 +103,13 @@ public class AccessibilityTools { SearchedAccessible = xacc; return ac; } else { - int k = ac.getAccessibleChildCount(); + long k = ac.getAccessibleChildCount(); if (ac.getAccessibleChildCount() > 100) { k = 50; } - for (int i = 0; i < k; i++) { + for (long i = 0; i < k; i++) { try { XAccessibleContext ac2 = getAccessibleObjectForRoleIgnoreShowing_( ac.getAccessibleChild(i), role); @@ -135,13 +135,13 @@ public class AccessibilityTools { SearchedAccessible = xacc; return ac; } else { - int k = ac.getAccessibleChildCount(); + long k = ac.getAccessibleChildCount(); if (ac.getAccessibleChildCount() > 100) { k = 50; } - for (int i = 0; i < k; i++) { + for (long i = 0; i < k; i++) { try { XAccessibleContext ac2 = getAccessibleObjectForRole_(ac.getAccessibleChild(i), role); @@ -186,13 +186,13 @@ public class AccessibilityTools { return ac; } else { - int k = ac.getAccessibleChildCount(); + long k = ac.getAccessibleChildCount(); if (ac.getAccessibleChildCount() > 100) { k = 50; } - for (int i = 0; i < k; i++) { + for (long i = 0; i < k; i++) { try { XAccessibleContext ac1 = getAccessibleObjectForRoleIgnoreShowing( ac.getAccessibleChild(i), @@ -227,13 +227,13 @@ public class AccessibilityTools { SearchedAccessible = xacc; return ac; } else { - int k = ac.getAccessibleChildCount(); + long k = ac.getAccessibleChildCount(); if (ac.getAccessibleChildCount() > 100) { k = 50; } - for (int i = 0; i < k; i++) { + for (long i = 0; i < k; i++) { try { XAccessibleContext ac1 = getAccessibleObjectForRole( ac.getAccessibleChild(i), @@ -287,13 +287,13 @@ public class AccessibilityTools { logging(log,indent + indent + "StateType contains SHOWING: " + isShowing); - int k = ac.getAccessibleChildCount(); + long k = ac.getAccessibleChildCount(); if (ac.getAccessibleChildCount() > 100) { k = 50; } - for (int i = 0; i < k; i++) { + for (long i = 0; i < k; i++) { try { printAccessibleTree(log, ac.getAccessibleChild(i), indent + " "); @@ -305,10 +305,10 @@ public class AccessibilityTools { if (ac.getAccessibleChildCount() > 100) { k = ac.getAccessibleChildCount(); - int st = ac.getAccessibleChildCount() - 50; + long st = ac.getAccessibleChildCount() - 50; logging(log,indent + " " + " ...... [skipped] ......"); - for (int i = st; i < k; i++) { + for (long i = st; i < k; i++) { try { printAccessibleTree(log, ac.getAccessibleChild(i), indent + " "); diff --git a/qadevOOo/runner/util/UITools.java b/qadevOOo/runner/util/UITools.java index c9969d355752..438bd1c6a7fb 100644 --- a/qadevOOo/runner/util/UITools.java +++ b/qadevOOo/runner/util/UITools.java @@ -157,7 +157,7 @@ public class UITools { xListBoxAccess, AccessibleRole.LIST, true); } - for (int i=0;i<xList.getAccessibleChildCount();i++) { + for (long i=0;i<xList.getAccessibleChildCount();i++) { try { XAccessible xChild = xList.getAccessibleChild(i); XAccessibleContext xChildCont = diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java index fee660617693..2bf4caf14bdf 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java @@ -292,7 +292,7 @@ public class _XAccessibleComponent extends MultiMethodTest { "," + (chBnd.Y + curY) + ") - OK"); boolean res = false; - int expIndex; + long expIndex; String expName; String expDesc; @@ -314,7 +314,7 @@ public class _XAccessibleComponent extends MultiMethodTest { } if (!res) { - int gotIndex = xAcc.getAccessibleContext() + long gotIndex = xAcc.getAccessibleContext() .getAccessibleIndexInParent(); if (expIndex < gotIndex) { @@ -485,7 +485,7 @@ public class _XAccessibleComponent extends MultiMethodTest { } XAccessibleContext xAccCon = xAcc.getAccessibleContext(); - int cnt = xAccCon.getAccessibleChildCount(); + long cnt = xAccCon.getAccessibleChildCount(); // for cases when too many children exist checking only first 50 if (cnt > 50) { @@ -494,7 +494,7 @@ public class _XAccessibleComponent extends MultiMethodTest { ArrayList<XAccessibleComponent> childComp = new ArrayList<XAccessibleComponent>(); - for (int i = 0; i < cnt; i++) { + for (long i = 0; i < cnt; i++) { try { XAccessible child = xAccCon.getAccessibleChild(i); XAccessibleContext xAccConCh = child.getAccessibleContext(); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java index f5b23c89bed7..8ce5e1647855 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java @@ -48,7 +48,7 @@ import util.AccessibilityTools; public class _XAccessibleContext extends MultiMethodTest { private static final String className = "com.sun.star.accessibility.XAccessibleContext"; public XAccessibleContext oObj = null; - private int childCount = 0; + private long childCount = 0; private XAccessible parent = null; // temporary while accessibility package is in com.sun.star @@ -85,13 +85,13 @@ public class _XAccessibleContext extends MultiMethodTest { log.println("testing 'getAccessibleChild()'..."); boolean bOK = true; - int counter = childCount; + long counter = childCount; if (childCount > 500) { counter = 500; } - for (int i = 0; i < counter; i++) { + for (long i = 0; i < counter; i++) { try { XAccessible ch = oObj.getAccessibleChild(i); XAccessibleContext chAC = ch.getAccessibleContext(); @@ -201,7 +201,7 @@ public class _XAccessibleContext extends MultiMethodTest { requiredMethod("getAccessibleParent()"); boolean bOK = true; - int idx = oObj.getAccessibleIndexInParent(); + long idx = oObj.getAccessibleIndexInParent(); XAccessibleContext parentAC = parent.getAccessibleContext(); diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java index 0cf632c47a38..d6b5a3cfbf71 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java @@ -56,7 +56,7 @@ public class _XAccessibleSelection extends MultiMethodTest { private static final String className = "com.sun.star.accessibility.XAccessibleSelection"; public XAccessibleSelection oObj = null; XAccessibleContext xAC = null; - int childCount; + long childCount; protected boolean multiSelection = true; protected boolean OneAlwaysSelected = false; @@ -131,7 +131,7 @@ public class _XAccessibleSelection extends MultiMethodTest { log.println("ChildCount: " + childCount); - int usedChildren = childCount; + long usedChildren = childCount; if (childCount > 500) { log.println("Restricting to 500"); @@ -140,7 +140,7 @@ public class _XAccessibleSelection extends MultiMethodTest { if (usedChildren > 0) { try { - for (int i = 0; i < usedChildren; i++) { + for (long i = 0; i < usedChildren; i++) { log.print("Trying to select child with index " + i + ": "); if (isSelectable(tEnv.getTestObject(), i)) { @@ -195,7 +195,7 @@ public class _XAccessibleSelection extends MultiMethodTest { res &= true; } - int SelectableChildCount = chkSelectable(tEnv.getTestObject()); + long SelectableChildCount = chkSelectable(tEnv.getTestObject()); if (SelectableChildCount > 500) { SelectableChildCount = 500; @@ -207,7 +207,7 @@ public class _XAccessibleSelection extends MultiMethodTest { try { oObj.selectAllAccessibleChildren(); - for (int k = 0; k < SelectableChildCount; k++) { + for (long k = 0; k < SelectableChildCount; k++) { log.println("Trying to select child with index " + k); if (isSelectable(tEnv.getTestObject(), k)) { @@ -289,7 +289,7 @@ public class _XAccessibleSelection extends MultiMethodTest { boolean res = true; boolean isSelected = true; - int SelectableChildCount = chkSelectable(tEnv.getTestObject()); + long SelectableChildCount = chkSelectable(tEnv.getTestObject()); if ((SelectableChildCount > 0) && multiSelection) { try { @@ -327,7 +327,7 @@ public class _XAccessibleSelection extends MultiMethodTest { if (multiSelection) { oObj.selectAllAccessibleChildren(); } else { - int usedChildren = childCount; + long usedChildren = childCount; if (childCount > 500) { log.println("Restricting to 500"); @@ -336,7 +336,7 @@ public class _XAccessibleSelection extends MultiMethodTest { if (usedChildren > 0) { try { - for (int i = 0; i < usedChildren; i++) { + for (long i = 0; i < usedChildren; i++) { if (isSelectable(tEnv.getTestObject(), i)) { log.print("Trying to select child with index "+i+": "); @@ -358,10 +358,10 @@ public class _XAccessibleSelection extends MultiMethodTest { } } - int sCount = chkSelectable(tEnv.getTestObject()); + long sCount = chkSelectable(tEnv.getTestObject()); log.println("Found " + sCount + " selectable Children"); - int selectedCount = oObj.getSelectedAccessibleChildCount(); + long selectedCount = oObj.getSelectedAccessibleChildCount(); log.println("After selecting all accessible " + selectedCount + " are selected"); @@ -398,7 +398,7 @@ public class _XAccessibleSelection extends MultiMethodTest { executeMethod("getSelectedAccessibleChildCount()"); boolean res = true; - int selectedCount = oObj.getSelectedAccessibleChildCount(); + long selectedCount = oObj.getSelectedAccessibleChildCount(); log.println("getSelectedAccessibleChildCount: " + selectedCount); try { @@ -421,14 +421,14 @@ public class _XAccessibleSelection extends MultiMethodTest { res &= true; } - int SelectableChildCount = chkSelectable(tEnv.getTestObject()); + long SelectableChildCount = chkSelectable(tEnv.getTestObject()); if (SelectableChildCount > 500) { SelectableChildCount = 500; } if (SelectableChildCount > 0) { - int k = 0; + long k = 0; try { for (k = 0; k < SelectableChildCount; k++) { log.println("Trying to select child with index " + k); @@ -468,7 +468,7 @@ public class _XAccessibleSelection extends MultiMethodTest { executeMethod("getSelectedAccessibleChild()"); boolean res = true; - int selCount = oObj.getSelectedAccessibleChildCount(); + long selCount = oObj.getSelectedAccessibleChildCount(); log.println("getSelectedAccessibleChildCount():" + selCount); try { @@ -499,13 +499,13 @@ public class _XAccessibleSelection extends MultiMethodTest { if ((childCount > 0) && (selCount > 0)) { try { - int maxCount = chkSelectable(tEnv.getTestObject()); + long maxCount = chkSelectable(tEnv.getTestObject()); if (childCount > 100) { maxCount = 100; } - for (int k = 0; k < maxCount; k++) { + for (long k = 0; k < maxCount; k++) { log.println("deselectAccessibleChild(" + k + ")"); if (oObj.isAccessibleChildSelected(k)) { @@ -513,7 +513,7 @@ public class _XAccessibleSelection extends MultiMethodTest { } } - int newSelCount = oObj.getSelectedAccessibleChildCount(); + long newSelCount = oObj.getSelectedAccessibleChildCount(); log.println("getSelectedAccessibleChildCount():" + newSelCount); @@ -533,17 +533,17 @@ public class _XAccessibleSelection extends MultiMethodTest { tRes.tested("deselectAccessibleChild()", res); } - protected static int chkSelectable(Object Testcase) { - int ret = 0; + protected static long chkSelectable(Object Testcase) { + long ret = 0; XAccessibleContext accCon = UnoRuntime.queryInterface( XAccessibleContext.class, Testcase); - int cc = accCon.getAccessibleChildCount(); + long cc = accCon.getAccessibleChildCount(); if (cc > 500) { return cc; } - for (int i = 0; i < cc; i++) { + for (long i = 0; i < cc; i++) { try { if ((accCon.getAccessibleChild(i).getAccessibleContext() .getAccessibleStateSet() @@ -558,7 +558,7 @@ public class _XAccessibleSelection extends MultiMethodTest { return ret; } - protected static boolean isSelectable(Object Testcase, int index) { + protected static boolean isSelectable(Object Testcase, long index) { XAccessibleContext accCon = UnoRuntime.queryInterface( XAccessibleContext.class, Testcase); boolean res = false; diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java index ee2400f44813..2e66b4306850 100644 --- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java +++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java @@ -793,7 +793,7 @@ public class _XAccessibleTable extends MultiMethodTest { try { log.print("getAccessibleIndex(-1," + (colCount-1) + "):"); - int indx = oObj.getAccessibleIndex(-1, colCount - 1); + long indx = oObj.getAccessibleIndex(-1, colCount - 1); log.println(indx); log.println("Exception was expected"); res &= false; @@ -804,7 +804,7 @@ public class _XAccessibleTable extends MultiMethodTest { try { log.print("getAccessibleIndex(" + (rowCount-1) + ",-1):"); - int indx = oObj.getAccessibleIndex(rowCount - 1, -1); + long indx = oObj.getAccessibleIndex(rowCount - 1, -1); log.println(indx); log.println("Exception was expected"); res &= false; @@ -815,7 +815,7 @@ public class _XAccessibleTable extends MultiMethodTest { try { log.print("getAccessibleIndex(0," + colCount + "):"); - int indx = oObj.getAccessibleIndex(0, colCount); + long indx = oObj.getAccessibleIndex(0, colCount); log.println(indx); log.println("Exception was expected"); res &= false; @@ -826,7 +826,7 @@ public class _XAccessibleTable extends MultiMethodTest { try { log.print("getAccessibleIndex(" + rowCount + ",0):"); - int indx = oObj.getAccessibleIndex(rowCount, 0); + long indx = oObj.getAccessibleIndex(rowCount, 0); log.println(indx); log.println("Exception was expected"); res &= false; @@ -838,12 +838,11 @@ public class _XAccessibleTable extends MultiMethodTest { try { log.print("getAccessibleIndex(" + (rowCount-1) + "," + (colCount-1) + "): "); - int indx = oObj.getAccessibleIndex( - rowCount - 1, colCount - 1); + long indx = oObj.getAccessibleIndex(rowCount - 1, colCount - 1); log.println(indx); if (xCellAc != null) { XAccessibleContext xAC = xCellAc.getAccessibleContext(); - int expIndx = xAC.getAccessibleIndexInParent(); + long expIndx = xAC.getAccessibleIndexInParent(); log.println("Expected index: " + expIndx); res &= expIndx == indx; } else { @@ -877,7 +876,7 @@ public class _XAccessibleTable extends MultiMethodTest { boolean res = true; if (xACont != null) { - int childCount = xACont.getAccessibleChildCount(); + long childCount = xACont.getAccessibleChildCount(); log.println("accessible child count: " + childCount); try { @@ -947,7 +946,7 @@ public class _XAccessibleTable extends MultiMethodTest { boolean res = true; if (xACont != null) { - int childCount = xACont.getAccessibleChildCount(); + long childCount = xACont.getAccessibleChildCount(); log.println("accessible child count: " + childCount); try { @@ -997,4 +996,4 @@ public class _XAccessibleTable extends MultiMethodTest { tRes.tested("getAccessibleColumn()", res); } -}
\ No newline at end of file +} diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java index 37b59c323f5d..cdae4e041f98 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java @@ -126,8 +126,8 @@ public class SwAccessibleDocumentView extends TestCase { if (first) SearchedContext = ac; else first=true; } else { - int k = ac.getAccessibleChildCount(); - for (int i=0;i<k;i++) { + long k = ac.getAccessibleChildCount(); + for (long i = 0; i < k; i++) { try { getAccessibleObjectForRole(ac.getAccessibleChild(i),role); if (SearchedContext != null) return ; diff --git a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java index 62f6e8454e3b..a1d79cc02c87 100644 --- a/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java +++ b/qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java @@ -171,8 +171,8 @@ public class SwAccessiblePageView extends TestCase { if (first) SearchedContext = ac; else first=true; } else { - int k = ac.getAccessibleChildCount(); - for (int i=0;i<k;i++) { + long k = ac.getAccessibleChildCount(); + for (long i = 0; i < k; i++) { try { getAccessibleObjectForRole(ac.getAccessibleChild(i),role); if (SearchedContext != null) return ; diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index 4abbedc9b09f..d1490013a9fa 100644 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.java @@ -404,7 +404,7 @@ public class ViewForwarder { accPC = UnoRuntime.queryInterface(XAccessibleComponent.class, parent); - int cCount = 0; + long cCount = 0; try { cCount = parent.getAccessibleContext().getAccessibleChildCount(); @@ -416,7 +416,7 @@ public class ViewForwarder { return; } - for (int i=0; i<cCount; i++) { + for (long i=0; i<cCount; i++) { try { XAccessible xA = parent.getAccessibleContext().getAccessibleChild(i); System.out.println("NAME object " + i + ": " + xA.getAccessibleContext().getAccessibleName()); @@ -691,7 +691,7 @@ public class ViewForwarder { e.printStackTrace(); } - int childCount = 0; + long childCount = 0; childCount = parent.getAccessibleContext().getAccessibleChildCount(); System.out.println("ChildCount: "+childCount); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 56aa59a8b237..854ad84f961d 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -53,7 +53,7 @@ rtl::Reference<ScAccessibleCell> ScAccessibleCell::create( const uno::Reference<XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc) { @@ -67,7 +67,7 @@ ScAccessibleCell::ScAccessibleCell( const uno::Reference<XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc) : @@ -211,14 +211,14 @@ tools::Rectangle ScAccessibleCell::GetBoundingBox() const //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleCell::getAccessibleChildCount() { return AccessibleStaticTextBase::getAccessibleChildCount(); } uno::Reference< XAccessible > SAL_CALL - ScAccessibleCell::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleCell::getAccessibleChild(sal_Int64 nIndex) { return AccessibleStaticTextBase::getAccessibleChild(nIndex); } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 22c74bcd1389..033c79566cd5 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -50,7 +50,7 @@ ScAccessibleCellBase::ScAccessibleCellBase( const uno::Reference<XAccessible>& rxParent, ScDocument* pDoc, const ScAddress& rCellAddress, - sal_Int32 nIndex) + sal_Int64 nIndex) : ScAccessibleContextBase(rxParent, AccessibleRole::TABLE_CELL), maCellAddress(rCellAddress), @@ -186,7 +186,7 @@ void SAL_CALL ScAccessibleCellBase::release() //===== XAccessibleContext ============================================== -sal_Int32 +sal_Int64 ScAccessibleCellBase::getAccessibleIndexInParent() { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 3dc2034b36da..0fc5b42a1ffe 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -222,14 +222,14 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( ) //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() { OSL_FAIL("should be implemented in the abrevated class"); return 0; } uno::Reference<XAccessible> SAL_CALL - ScAccessibleContextBase::getAccessibleChild(sal_Int32 /* nIndex */) + ScAccessibleContextBase::getAccessibleChild(sal_Int64 /* nIndex */) { OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessible>(); @@ -241,7 +241,7 @@ uno::Reference<XAccessible> SAL_CALL return mxParent; } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleContextBase::getAccessibleIndexInParent() { SolarMutexGuard aGuard; @@ -249,7 +249,7 @@ sal_Int32 SAL_CALL // Use a simple but slow solution for now. Optimize later. // Return -1 to indicate that this object's parent does not know about the // object. - sal_Int32 nIndex(-1); + sal_Int64 nIndex(-1); // Iterate over all the parent's children and search for this object. if (mxParent.is()) @@ -258,8 +258,8 @@ sal_Int32 SAL_CALL mxParent->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for (sal_Int64 i=0; i<nChildCount; ++i) { uno::Reference<XAccessible> xChild (xParentContext->getAccessibleChild (i)); if (xChild.is() && xChild.get() == this) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 3155affcea98..9d7e2bab5799 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -274,13 +274,13 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( ) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() { ensureAlive(); return 0; } -Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int32 /* nIndex */ ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int64 /* nIndex */ ) { ensureAlive(); throw IndexOutOfBoundsException(); @@ -813,7 +813,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground( ) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() { SolarMutexGuard aGuard; ensureAlive(); @@ -822,7 +822,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() Reference<XAccessible> ScAccessibleCsvGrid::getAccessibleCell(sal_Int32 nRow, sal_Int32 nColumn) { - sal_Int32 nIndex = implGetIndex(nRow, nColumn); + sal_Int64 nIndex = implGetIndex(nRow, nColumn); XAccessibleSet::iterator aI = maAccessibleChildren.lower_bound(nIndex); if (aI != maAccessibleChildren.end() && !(maAccessibleChildren.key_comp()(nIndex, aI->first))) @@ -836,7 +836,7 @@ Reference<XAccessible> ScAccessibleCsvGrid::getAccessibleCell(sal_Int32 nRow, sa return xNew; } -Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1006,7 +1006,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleSelected( sal_Int32 /* nRow * return isAccessibleColumnSelected( nColumn ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1014,7 +1014,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_ return implGetIndex( nRow, nColumn ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1022,7 +1022,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex return implGetRow( nChildIndex ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1032,7 +1032,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd // XAccessibleSelection ------------------------------------------------------- -void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1044,7 +1044,7 @@ void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex implSelectColumn( nColumn, true ); } -sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1065,14 +1065,14 @@ void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() selectAccessibleChild( 0 ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() { SolarMutexGuard aGuard; ensureAlive(); - return implGetRowCount() * implGetSelColumnCount(); + return static_cast<sal_Int64>(implGetRowCount()) * static_cast<sal_Int64>(implGetSelColumnCount()); } -Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1085,10 +1085,11 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChil return getAccessibleCellAt( nRow, nColumn ); } -void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) +void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); + ensureValidIndex(nSelectedChildIndex); sal_Int32 nColumns = implGetSelColumnCount(); if( nColumns == 0 ) throw IndexOutOfBoundsException(); @@ -1194,7 +1195,7 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleDescription() return ScResId( STR_ACC_CSVGRID_DESCR ); } -void ScAccessibleCsvGrid::ensureValidIndex( sal_Int32 nIndex ) const +void ScAccessibleCsvGrid::ensureValidIndex( sal_Int64 nIndex ) const { if( (nIndex < 0) || (nIndex >= implGetCellCount()) ) throw IndexOutOfBoundsException(); @@ -1329,17 +1330,17 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground( ) // XAccessibleContext ----------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() { return AccessibleStaticTextBase::getAccessibleChildCount(); } -Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int64 nIndex ) { return AccessibleStaticTextBase::getAccessibleChild( nIndex ); } -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() { SolarMutexGuard aGuard; ensureAlive(); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b8a40b814b00..475dd9597673 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1048,8 +1048,8 @@ bool ScChildrenShapes::FindSelectedShapesChanges(const uno::Reference<drawing::X static_cast< ::accessibility::AccessibleShape* >(xAccGroupShape.get()); if( pAccGroupShape ) { - sal_Int32 nCount = pAccGroupShape->getAccessibleChildCount(); - for( sal_Int32 i = 0; i < nCount; i++ ) + sal_Int64 nCount = pAccGroupShape->getAccessibleChildCount(); + for( sal_Int64 i = 0; i < nCount; i++ ) { uno::Reference<XAccessible> xAccShape = pAccGroupShape->getAccessibleChild(i); if (xAccShape.is()) @@ -1677,12 +1677,12 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) //===== XAccessibleContext ============================================== /// Return the number of currently visible children. -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleDocument::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nCount(1); + sal_Int64 nCount(1); if (mpChildrenShapes) nCount = mpChildrenShapes->GetCount(); // returns the count of the shapes inclusive the table @@ -1694,14 +1694,14 @@ sal_Int32 SAL_CALL /// Return the specified child or NULL if index is invalid. uno::Reference<XAccessible> SAL_CALL - ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleDocument::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); uno::Reference<XAccessible> xAccessible; if (nIndex >= 0) { - sal_Int32 nCount(1); + sal_Int64 nCount(1); if (mpChildrenShapes) { xAccessible = mpChildrenShapes->Get(nIndex); // returns NULL if it is the table or out of range @@ -1785,7 +1785,7 @@ OUString SAL_CALL ///===== XAccessibleSelection =========================================== void SAL_CALL - ScAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex ) + ScAccessibleDocument::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1814,7 +1814,7 @@ void SAL_CALL } sal_Bool SAL_CALL - ScAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex ) + ScAccessibleDocument::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1871,12 +1871,12 @@ void SAL_CALL } } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleDocument::getSelectedAccessibleChildCount( ) { SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nCount(0); + sal_Int64 nCount(0); if (mpChildrenShapes) nCount = mpChildrenShapes->GetSelectedCount(); @@ -1891,14 +1891,14 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible > SAL_CALL - ScAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + ScAccessibleDocument::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); uno::Reference<XAccessible> xAccessible; if (mpChildrenShapes) { - sal_Int32 nCount(getSelectedAccessibleChildCount()); //all shapes and the table + sal_Int64 nCount(getSelectedAccessibleChildCount()); //all shapes and the table if (nSelectedChildIndex < 0 || nSelectedChildIndex >= nCount) throw lang::IndexOutOfBoundsException(); @@ -1918,7 +1918,7 @@ uno::Reference<XAccessible > SAL_CALL } void SAL_CALL - ScAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex ) + ScAccessibleDocument::deselectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 666965a7aaf1..8d968dfa3f07 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1342,12 +1342,12 @@ void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); - tools::Long nRet = 0; + sal_Int64 nRet = 0; if ( mpViewShell ) { ScPagePreviewCountData aCount( mpViewShell->GetLocationData(), mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() ); @@ -1357,7 +1357,7 @@ sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() return nRet; } -uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int32 nIndex) +uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1404,7 +1404,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi } else { - sal_Int32 nIdx(nIndex - (aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters)); + sal_Int64 nIdx(nIndex - (aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters)); if (nIdx < aCount.nForeShapes) xAccessible = GetShapeChildren()->GetForeShape(nIdx); else diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 5f79718dfa72..d500aa2a3a21 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -244,7 +244,7 @@ tools::Rectangle ScAccessibleEditObject::GetBoundingBox() const //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleEditObject::getAccessibleChildCount() { SolarMutexGuard aGuard; @@ -254,7 +254,7 @@ sal_Int32 SAL_CALL } uno::Reference< XAccessible > SAL_CALL - ScAccessibleEditObject::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleEditObject::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -446,11 +446,11 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor) } //===== XAccessibleSelection ============================================ -void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 ) +void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int64 ) { } -sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int64 nChildIndex ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -479,21 +479,21 @@ void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren( ) { } -sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() { - sal_Int32 nCount = 0; - sal_Int32 TotalCount = getAccessibleChildCount(); - for( sal_Int32 i = 0; i < TotalCount; i++ ) + sal_Int64 nCount = 0; + sal_Int64 TotalCount = getAccessibleChildCount(); + for( sal_Int64 i = 0; i < TotalCount; i++ ) if( isAccessibleChildSelected(i) ) nCount++; return nCount; } -uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { - if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) + if ( nSelectedChildIndex < 0 || nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); - sal_Int32 i1, i2; - for( i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) + + for (sal_Int64 i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) if( isAccessibleChildSelected(i1) ) { if( i2 == nSelectedChildIndex ) @@ -503,8 +503,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessib return uno::Reference<XAccessible>(); } -void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild( - sal_Int32 ) +void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild(sal_Int64) { } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index eae58f644666..7e7b1b5f50b5 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -149,7 +149,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nCount(getAccessibleChildCount()); // fill the areas + sal_Int64 nCount(getAccessibleChildCount()); // fill the areas if (nCount) { @@ -182,7 +182,7 @@ void SAL_CALL ScAccessiblePageHeader::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -212,7 +212,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() return mnChildCount; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int32 nIndex ) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -243,7 +243,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChil return xRet; } -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() { return mnIndex; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 87c948108fce..df019683a708 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -118,7 +118,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessiblePageHeaderArea::getAccessibleChildCount() { SolarMutexGuard aGuard; @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL } uno::Reference< XAccessible > SAL_CALL - ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int32 nIndex) + ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 60051d21ac79..e36b1c78875f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -120,7 +120,7 @@ void SAL_CALL ScAccessiblePreviewCell::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() return mpTextHelper->GetChildCount(); } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int32 nIndex) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 3213806d395e..c7b767d0eb0b 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -205,7 +205,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -214,7 +214,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() return mxTextHelper->GetChildCount(); } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int32 nIndex) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -223,7 +223,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi return mxTextHelper->GetChild(nIndex); } -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() { return mnIndex; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index e30d1ce9e7ac..feaabfa820d1 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -345,7 +345,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow return false; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -356,11 +356,11 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, throw lang::IndexOutOfBoundsException(); // index iterates horizontally - sal_Int32 nRet = nRow * mpTableInfo->GetCols() + nColumn; + sal_Int64 nRet = static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(mpTableInfo->GetCols()) + nColumn; return nRet; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -374,7 +374,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildI return nRow; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -452,7 +452,7 @@ void SAL_CALL ScAccessiblePreviewTable::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -461,11 +461,11 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() tools::Long nRet = 0; if ( mpTableInfo ) - nRet = static_cast<sal_Int32>(mpTableInfo->GetCols()) * mpTableInfo->GetRows(); + nRet = static_cast<sal_Int64>(mpTableInfo->GetCols()) * mpTableInfo->GetRows(); return nRet; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int32 nIndex ) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -480,8 +480,8 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh { // nCol, nRow are within the visible table, not the document sal_Int32 nCol = nIndex % nColumns; - sal_Int32 nRow = nIndex / nColumns; - + sal_Int64 nRow = nIndex / nColumns; + assert(nRow <= std::numeric_limits<sal_Int32>::max()); xRet = getAccessibleCellAt( nRow, nCol ); } } @@ -492,7 +492,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh return xRet; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() { return mnIndex; } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index fbf3a408a51f..23f017e5675c 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1063,7 +1063,7 @@ sal_Int64 SAL_CALL ScAccessibleSpreadsheet::getAccessibleStateSet() ///===== XAccessibleSelection =========================================== -void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1108,17 +1108,17 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren( ) mpViewShell->SelectAll(); } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleChildCount( ) { SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nResult(0); + sal_Int64 nResult(0); if (mpViewShell) { if (IsFormulaMode()) { - nResult = GetRowAll() * GetColAll() ; + nResult = static_cast<sal_Int64>(GetRowAll()) * static_cast<sal_Int64>(GetColAll()); } else { @@ -1137,7 +1137,7 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible > SAL_CALL - ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1175,7 +1175,7 @@ uno::Reference<XAccessible > SAL_CALL return xAccessible; } -void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1598,13 +1598,13 @@ bool ScAccessibleSpreadsheet::IsScAddrFormulaSel(const ScAddress &addr) const addr.Tab() == mpViewShell->GetViewData().GetTabNo(); } -bool ScAccessibleSpreadsheet::CheckChildIndex(sal_Int32 nIndex) const +bool ScAccessibleSpreadsheet::CheckChildIndex(sal_Int64 nIndex) const { - sal_Int32 nMaxIndex = (m_nMaxX - m_nMinX +1)*(m_nMaxY - m_nMinY +1) -1 ; + sal_Int64 nMaxIndex = static_cast<sal_Int64>(m_nMaxX - m_nMinX +1) * static_cast<sal_Int64>(m_nMaxY - m_nMinY +1) -1 ; return nIndex <= nMaxIndex && nIndex >= 0 ; } -ScAddress ScAccessibleSpreadsheet::GetChildIndexAddress(sal_Int32 nIndex) const +ScAddress ScAccessibleSpreadsheet::GetChildIndexAddress(sal_Int64 nIndex) const { sal_Int32 nRowAll = GetRowAll(); sal_uInt16 nColAll = GetColAll(); @@ -1619,7 +1619,7 @@ ScAddress ScAccessibleSpreadsheet::GetChildIndexAddress(sal_Int32 nIndex) const ); } -sal_Int32 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ) { sal_uInt16 nColRelative = sal_uInt16(nColumn) - GetColAll(); sal_Int32 nRowRelative = nRow - GetRowAll(); @@ -1627,7 +1627,7 @@ sal_Int32 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sa { return -1; } - return GetRowAll() * nRowRelative + nColRelative; + return static_cast<sal_Int64>(GetRowAll()) * static_cast<sal_Int64>(nRowRelative) + nColRelative; } bool ScAccessibleSpreadsheet::IsFormulaMode() diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 3b1d8fee750c..5ce54fad56df 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -263,7 +263,7 @@ sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow // ===== XAccessibleExtendedTable ======================================== -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -276,10 +276,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sa nRow -= maRange.aStart.Row(); nColumn -= maRange.aStart.Col(); - return (nRow * (maRange.aEnd.Col() + 1)) + nColumn; + return (static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(maRange.aEnd.Col() + 1)) + nColumn; } -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -290,7 +290,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildInde return nChildIndex / (maRange.aEnd.Col() - maRange.aStart.Col() + 1); } -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -303,7 +303,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI // ===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -312,15 +312,13 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() // this needs a radical re-think. sal_Int64 nMax = static_cast<sal_Int64>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) * static_cast<sal_Int64>(maRange.aEnd.Col() - maRange.aStart.Col() + 1); - if (nMax > SAL_MAX_INT32) - nMax = SAL_MAX_INT32; if (nMax < 0) return 0; - return static_cast<sal_Int32>(nMax); + return nMax; } uno::Reference< XAccessible > SAL_CALL - ScAccessibleTableBase::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleTableBase::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -369,12 +367,12 @@ sal_Int64 SAL_CALL ScAccessibleTableBase::getAccessibleStateSet() ///===== XAccessibleSelection =========================================== -void SAL_CALL ScAccessibleTableBase::selectAccessibleChild( sal_Int32 /* nChildIndex */ ) +void SAL_CALL ScAccessibleTableBase::selectAccessibleChild( sal_Int64 /* nChildIndex */ ) { } sal_Bool SAL_CALL - ScAccessibleTableBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) + ScAccessibleTableBase::isAccessibleChildSelected( sal_Int64 nChildIndex ) { // I don't need to guard, because the called functions have a guard if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) @@ -391,20 +389,20 @@ void SAL_CALL ScAccessibleTableBase::selectAllAccessibleChildren() { } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleTableBase::getSelectedAccessibleChildCount( ) { return 0; } uno::Reference<XAccessible > SAL_CALL - ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) + ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int64 /* nSelectedChildIndex */ ) { uno::Reference < XAccessible > xAccessible; return xAccessible; } -void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) +void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int64 /* nSelectedChildIndex */ ) { } diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index d86d1eddad50..87c754992856 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -50,7 +50,7 @@ public: const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc); @@ -59,7 +59,7 @@ private: const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc); @@ -101,13 +101,13 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand 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. virtual sal_Int64 SAL_CALL diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 6ba0bade835b..f756faf4821f 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -37,7 +37,7 @@ public: const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScDocument* pDoc, const ScAddress& rCellAddress, - sal_Int32 nIndex); + sal_Int64 nIndex); protected: virtual ~ScAccessibleCellBase() override; public: @@ -62,7 +62,7 @@ public: ///===== XAccessibleContext ============================================== /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; protected: @@ -115,7 +115,7 @@ protected: ScDocument* mpDoc; - sal_Int32 mnIndex; + sal_Int64 mnIndex; private: virtual bool IsEditable(sal_Int64 nParentStates); diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 879de23a7442..8fa51ea52382 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -120,18 +120,18 @@ public: ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. 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/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 576389f1d73e..6dfc22433880 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -111,10 +111,10 @@ public: // XAccessibleContext ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Throws an exception (the ruler does not have children). */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; virtual sal_Int16 SAL_CALL getAccessibleRole( ) override { return css::accessibility::AccessibleRole::TEXT; } @@ -232,7 +232,7 @@ typedef ::cppu::ImplHelper3< class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public ScAccessibleCsvGridImpl { protected: - typedef std::map< sal_Int32, rtl::Reference<ScAccessibleCsvCell> > XAccessibleSet; + typedef std::map< sal_Int64, rtl::Reference<ScAccessibleCsvCell> > XAccessibleSet; private: XAccessibleSet maAccessibleChildren; @@ -262,10 +262,10 @@ public: // XAccessibleContext ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Returns the specified child cell. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; /** Returns the relation to the ruler control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; @@ -326,21 +326,21 @@ public: virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the child index of the cell at the specified position. */ - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the row index of the specified child. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; /** Returns the column index of the specified child. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; /** Returns true, if the specified child is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; /** Deselects all cells. */ virtual void SAL_CALL clearAccessibleSelection() override; @@ -349,13 +349,13 @@ public: virtual void SAL_CALL selectAllAccessibleChildren() override; /** Returns the count of selected children. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount() override; /** Returns the child with the specified index in all selected children. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; /** Deselects the child with the specified index in all selected children. */ - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; // XInterface ------------------------------------------------------------- @@ -388,7 +388,7 @@ public: private: /** @throws css::lang::IndexOutOfBoundsException if nIndex is not a valid child index. */ - void ensureValidIndex( sal_Int32 nIndex ) const; + void ensureValidIndex( sal_Int64 nIndex ) const; /** @Throws css::lang::IndexOutOfBoundsException if the specified position is invalid. */ void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const; @@ -407,16 +407,16 @@ private: /** Returns the count of selected columns in the table. */ sal_Int32 implGetSelColumnCount() const; /** Returns the total cell count in the table (including header). */ - sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); } + sal_Int64 implGetCellCount() const { return static_cast<sal_Int64>(implGetRowCount()) * static_cast<sal_Int64>(implGetColumnCount()); } /** Returns the row index from cell index (including header). */ - sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); } + sal_Int32 implGetRow( sal_Int64 nIndex ) const { return nIndex / implGetColumnCount(); } /** Returns the column index from cell index (including header). */ - sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); } + sal_Int32 implGetColumn( sal_Int64 nIndex ) const { return nIndex % implGetColumnCount(); } /** Returns the absolute column index of the nSelColumn-th selected column. */ sal_Int32 implGetSelColumn( sal_Int32 nSelColumn ) const; /** Returns the child index from cell position (including header). */ - sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; } + sal_Int64 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(implGetColumnCount()) + nColumn; } /** Returns the contents of the specified cell (including header). Indexes must be valid. */ OUString implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const; @@ -469,13 +469,13 @@ public: // XAccessibleContext ----------------------------------------------------- /** Returns the child count. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Returns the specified child. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; /** Returns the index of this cell in the table. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** Returns the relation to the ruler control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 35ae8666969c..95122e789b87 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -98,12 +98,12 @@ 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 NULL if index is invalid. 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. virtual sal_Int64 SAL_CALL @@ -116,10 +116,10 @@ public: ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) override; + selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + isAccessibleChildSelected( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -127,15 +127,15 @@ public: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) override; + deselectAccessibleChild( sal_Int64 nChildIndex ) override; ///===== XSelectionListener ============================================= diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index fc595fd86bd5..c129a8879efc 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -64,11 +64,11 @@ public: ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. 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. virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index b8f64099f63f..b76ebe936eb0 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -104,13 +104,13 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand 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. virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; @@ -118,16 +118,16 @@ 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; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; protected: /// Return this object's description. diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index cfd0803f1bf1..ff8cd8ffe1a5 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -54,10 +54,10 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 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; + getAccessibleChild( sal_Int64 i ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; //===== XServiceInfo ==================================================== diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index d51580d852e5..de4ac2dcea24 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -61,13 +61,13 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand 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. virtual sal_Int64 SAL_CALL diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index bd120f930dfc..7dbe4d1e03b4 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -58,9 +58,9 @@ public: //===== XAccessibleContext ============================================== // override to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; + getAccessibleChild( sal_Int64 i ) override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index e39f05ccc543..64d3670b78cf 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -82,10 +82,10 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 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; + getAccessibleChild( sal_Int64 i ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; //===== XServiceInfo ==================================================== diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index e93ed6bc6945..bd4ba93e689b 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -82,9 +82,9 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; //===== XAccessibleComponent ============================================ @@ -94,10 +94,10 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 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; + getAccessibleChild( sal_Int64 i ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; //===== XServiceInfo ==================================================== diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 2273c9ded344..78e735942270 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -161,7 +161,7 @@ private: ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) override; + selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -169,14 +169,14 @@ private: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) override; + deselectAccessibleChild( sal_Int64 nChildIndex ) override; ///===== XServiceInfo ==================================================== @@ -235,9 +235,9 @@ private: sal_uInt16 GetColAll() const { return m_nMaxX - m_nMinX + 1; } void NotifyRefMode(); void RemoveFormulaSelection(bool bRemoveAll = false); - bool CheckChildIndex(sal_Int32) const; - ScAddress GetChildIndexAddress(sal_Int32) const; - sal_Int32 GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ); + bool CheckChildIndex(sal_Int64) const; + ScAddress GetChildIndexAddress(sal_Int64) const; + sal_Int64 GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ); bool GetFormulaCurrentFocusCell(ScAddress &addr); ScTabViewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 0a9514bffc7f..6fac6ce5376a 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -135,28 +135,28 @@ public: ///===== XAccessibleExtendedTable ======================================== /// Returns the index of the cell on the given position. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL - getAccessibleRow( sal_Int32 nChildIndex ) override; + getAccessibleRow( sal_Int64 nChildIndex ) override; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL - getAccessibleColumn( sal_Int32 nChildIndex ) override; + getAccessibleColumn( sal_Int64 nChildIndex ) override; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override; @@ -184,10 +184,10 @@ public: ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) override; + selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + isAccessibleChildSelected( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -195,14 +195,14 @@ public: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; ///===== XServiceInfo =================================================== diff --git a/sd/qa/unit/a11y/layout.cxx b/sd/qa/unit/a11y/layout.cxx index 9af31dff8c80..342590b31fba 100644 --- a/sd/qa/unit/a11y/layout.cxx +++ b/sd/qa/unit/a11y/layout.cxx @@ -54,7 +54,7 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestImpressDefaultLayout) * shape (subtitle) * paragraph */ - CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDocumentContext->getAccessibleChildCount()); + CPPUNIT_ASSERT_EQUAL(sal_Int64(3), xDocumentContext->getAccessibleChildCount()); CPPUNIT_ASSERT_EQUAL( OUString("PresentationTitle "), xDocumentContext->getAccessibleChild(1)->getAccessibleContext()->getAccessibleName()); diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index f4809fa31353..e6896d0d3014 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -224,7 +224,7 @@ Reference<XAccessible> SAL_CALL return AccessibleContextBase::getAccessibleParent(); } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleDocumentViewBase::getAccessibleChildCount() { ThrowIfDisposed (); @@ -236,7 +236,7 @@ sal_Int32 SAL_CALL } Reference<XAccessible> SAL_CALL - AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex) + AccessibleDocumentViewBase::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); @@ -263,8 +263,8 @@ uno::Reference<XAccessible > SAL_CALL ::osl::MutexGuard aGuard (m_aMutex); uno::Reference<XAccessible> xChildAtPosition; - sal_Int32 nChildCount = getAccessibleChildCount (); - for (sal_Int32 i=nChildCount-1; i>=0; --i) + sal_Int64 nChildCount = getAccessibleChildCount (); + for (sal_Int64 i=nChildCount-1; i>=0; --i) { Reference<XAccessible> xChild (getAccessibleChild (i)); if (xChild.is()) @@ -632,16 +632,16 @@ uno::Reference< XAccessibleContext > return this; } -// return sal_False in default case +// return false in default case bool - AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) + AccessibleDocumentViewBase::implIsSelected( sal_Int64 ) { return false; } -// return nothing in default case +// do nothing in default case void - AccessibleDocumentViewBase::implSelect( sal_Int32, bool ) + AccessibleDocumentViewBase::implSelect( sal_Int64, bool ) { } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index f6111962a8a2..690a8c865f2c 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -182,12 +182,12 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleDrawDocumentView::getAccessibleChildCount() { ThrowIfDisposed (); - tools::Long nChildCount = AccessibleDocumentViewBase::getAccessibleChildCount(); + sal_Int64 nChildCount = AccessibleDocumentViewBase::getAccessibleChildCount(); // Forward request to children manager. if (mpChildrenManager != nullptr) @@ -197,14 +197,14 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible> SAL_CALL - AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex) + AccessibleDrawDocumentView::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); ::osl::ClearableMutexGuard aGuard (m_aMutex); // Take care of children of the base class. - sal_Int32 nCount = AccessibleDocumentViewBase::getAccessibleChildCount(); + sal_Int64 nCount = AccessibleDocumentViewBase::getAccessibleChildCount(); if (nCount > 0) { if (nIndex < nCount) @@ -566,7 +566,7 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName() /** Return selection state of specified child */ bool - AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex ) + AccessibleDrawDocumentView::implIsSelected( sal_Int64 nAccessibleChildIndex ) { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); @@ -607,7 +607,7 @@ bool the XSelectionSupplier of the controller. */ void - AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) + AccessibleDrawDocumentView::implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); @@ -628,7 +628,7 @@ void uno::Reference< drawing::XShapes > xShapes = drawing::ShapeCollection::create( comphelper::getProcessComponentContext()); - for(sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for(sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { AccessibleShape* pAcc = comphelper::getFromUnoTunnel<AccessibleShape>( getAccessibleChild( i ) ); diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 4e020efeff9e..d7277c74c71b 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -93,7 +93,7 @@ void AccessibleOutlineView::ViewForwarderChanged() //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleOutlineView::getAccessibleChildCount() { ThrowIfDisposed (); @@ -103,7 +103,7 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible> SAL_CALL - AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex) + AccessibleOutlineView::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); // Forward request to children manager. diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index c9de70705d9d..894f7b724b42 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -55,7 +55,7 @@ AccessiblePageShape::~AccessiblePageShape() //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessiblePageShape::getAccessibleChildCount() { return 0; @@ -65,7 +65,7 @@ sal_Int32 SAL_CALL an exception for a wrong index. */ uno::Reference<XAccessible> SAL_CALL - AccessiblePageShape::getAccessibleChild( sal_Int32 ) + AccessiblePageShape::getAccessibleChild( sal_Int64 ) { throw lang::IndexOutOfBoundsException ("page shape has no children", static_cast<uno::XWeak*>(this)); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 55629979d52d..c22077fe42c7 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -105,13 +105,13 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() { ThrowIfDisposed(); return 0; } -Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) +Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int64 ) { ThrowIfDisposed(); throw lang::IndexOutOfBoundsException(); @@ -123,19 +123,19 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent return mxParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - sal_Int32 nIndexInParent(-1); + sal_Int64 nIndexInParent(-1); if (mxParent.is()) { Reference<XAccessibleContext> xParentContext (mxParent->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount (xParentContext->getAccessibleChildCount()); + for (sal_Int64 i=0; i<nChildCount; ++i) if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 6a569171cb67..4c197a71279a 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -193,7 +193,7 @@ Reference<XAccessibleContext > SAL_CALL //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -201,7 +201,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() } Reference<XAccessible > SAL_CALL - AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) + AccessibleSlideSorterView::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -228,18 +228,18 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent( return xParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() { OSL_ASSERT(getAccessibleParent().is()); ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - sal_Int32 nIndexInParent(-1); + sal_Int64 nIndexInParent(-1); Reference<XAccessibleContext> xParentContext (getAccessibleParent()->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount (xParentContext->getAccessibleChildCount()); + for (sal_Int64 i=0; i<nChildCount; ++i) if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { @@ -493,11 +493,14 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground() //===== XAccessibleSelection ================================================== -void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) +void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int64 nChildIndex) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); if (pChild == nullptr) throw lang::IndexOutOfBoundsException(); @@ -505,12 +508,15 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild mrSlideSorter.GetController().GetPageSelector().SelectPage(pChild->GetPageNumber()); } -sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) +sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int64 nChildIndex) { ThrowIfDisposed(); bool bIsSelected = false; const SolarMutexGuard aSolarGuard; + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); if (pChild == nullptr) throw lang::IndexOutOfBoundsException(); @@ -537,7 +543,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren() mrSlideSorter.GetController().GetPageSelector().SelectAllPages(); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; @@ -545,10 +551,14 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() } Reference<XAccessible > SAL_CALL - AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) + AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int64 nSelectedChildIndex ) { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; + + if (nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + Reference<XAccessible> xChild; ::sd::slidesorter::controller::PageSelector& rSelector ( @@ -572,11 +582,14 @@ Reference<XAccessible > SAL_CALL return xChild; } -void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) +void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int64 nChildIndex) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); if (pChild == nullptr) throw lang::IndexOutOfBoundsException(); diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index e940357f18ce..a514cfc42462 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -139,14 +139,14 @@ public: /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. */ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; //===== XAccessibleComponent ============================================ @@ -232,11 +232,11 @@ private: // return sal_False in default case virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) override; + implIsSelected( sal_Int64 nAccessibleChildIndex ) override; // return nothing in default case virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; + implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; protected: /// The API window that is made accessible. diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 202edd0ea88d..924723a31120 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -60,11 +60,11 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual OUString SAL_CALL getAccessibleName() override; @@ -107,7 +107,7 @@ private: getSupportedServiceNames() override; virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) override; + implIsSelected( sal_Int64 nAccessibleChildIndex ) override; /** Select or deselect the specified child or all children if the given index has the special value ACCESSIBLE_SELECTION_CHILD_ALL. @@ -123,7 +123,7 @@ private: reps. children. */ virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; + implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; ::sd::ViewShell* mpSdViewSh; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 5fa1df7c505c..ddff1b465289 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -55,11 +55,11 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual OUString SAL_CALL getAccessibleName() override; //===== XAccessibleEventBroadcaster ======================================== diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 06dc76555214..1e7568ab0038 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -58,7 +58,7 @@ public: //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Return the specified child. @@ -71,7 +71,7 @@ public: Throws always an exception because there are no children. */ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 31ba6cc4d053..97bea8519768 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -90,16 +90,16 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index ab5c316f77eb..0cbaf62ed586 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -99,19 +99,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. @@ -189,10 +189,10 @@ public: //===== XAccessibleSelection ============================================== virtual void SAL_CALL - selectAccessibleChild (sal_Int32 nChildIndex) override; + selectAccessibleChild (sal_Int64 nChildIndex) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + isAccessibleChildSelected( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -200,15 +200,15 @@ public: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; //===== XServiceInfo ==================================================== diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 2a867d6aa3b4..4f2fa33f3866 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -103,14 +103,14 @@ public: //----- XAccessibleContext ---------------------------------------------- - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) 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; @@ -750,17 +750,15 @@ Reference<XAccessibleContext> SAL_CALL //----- XAccessibleContext ---------------------------------------------- -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount() +sal_Int64 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount() { ThrowIfDisposed(); - const sal_Int32 nChildCount (maChildren.size()); - - return nChildCount; + return maChildren.size(); } Reference<XAccessible> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int32 nIndex) + PresenterAccessible::AccessibleObject::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed(); @@ -778,7 +776,7 @@ Reference<XAccessible> SAL_CALL return mxParentAccessible; } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleIndexInParent() { ThrowIfDisposed(); @@ -787,7 +785,7 @@ sal_Int32 SAL_CALL if (mxParentAccessible.is()) { const Reference<XAccessibleContext> xContext (mxParentAccessible->getAccessibleContext()); - for (sal_Int32 nIndex=0,nCount=xContext->getAccessibleChildCount(); + for (sal_Int64 nIndex = 0, nCount=xContext->getAccessibleChildCount(); nIndex<nCount; ++nIndex) { diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index a4283382d68a..985a66fefa12 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -69,19 +69,22 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewAcc::g return this; } -sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount() +sal_Int64 SAL_CALL ThumbnailViewAcc::getAccessibleChildCount() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); - sal_Int32 nCount = mpParent->ImplGetVisibleItemCount(); - return nCount; + return mpParent->ImplGetVisibleItemCount(); } -uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleChild( sal_Int32 i ) +uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAccessibleChild( sal_Int64 i ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (i < 0 || i >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + ThumbnailViewItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(i)); if( !pItem ) @@ -98,13 +101,13 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getAcces return mpParent->GetDrawingArea()->get_accessible_parent(); } -sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; uno::Reference<accessibility::XAccessible> xParent(getAccessibleParent()); if (!xParent) @@ -117,8 +120,8 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() // iterate over parent's children and search for this object if ( xParentContext.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for ( sal_Int32 nChild = 0; ( nChild < nChildCount ) && ( -1 == nRet ); ++nChild ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for ( sal_Int64 nChild = 0; ( nChild < nChildCount ) && ( -1 == nRet ); ++nChild ) { uno::Reference<XAccessible> xChild(xParentContext->getAccessibleChild(nChild)); if ( xChild.get() == this ) @@ -356,10 +359,14 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int64 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + ThumbnailViewItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); if(pItem == nullptr) @@ -368,10 +375,14 @@ void SAL_CALL ThumbnailViewAcc::selectAccessibleChild( sal_Int32 nChildIndex ) mpParent->SelectItem( pItem->mnId ); } -sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int64 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + ThumbnailViewItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); if (pItem == nullptr) @@ -391,11 +402,11 @@ void SAL_CALL ThumbnailViewAcc::selectAllAccessibleChildren() // unsupported due to single selection only } -sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; for( sal_uInt16 i = 0, nCount = getItemCount(); i < nCount; i++ ) { @@ -408,7 +419,7 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChildCount() return nRet; } -uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -425,10 +436,14 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewAcc::getSelec return xRet; } -void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int32 ) +void SAL_CALL ThumbnailViewAcc::deselectAccessibleChild( sal_Int64 nChildIndex) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + // Because of the single selection we can reset the whole selection when // the specified child is currently selected. //FIXME TODO if (isAccessibleChildSelected(nChildIndex)) @@ -586,12 +601,12 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ThumbnailViewItemAc return this; } -sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleChildCount() +sal_Int64 SAL_CALL ThumbnailViewItemAcc::getAccessibleChildCount() { return 0; } -uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleChild( sal_Int32 ) +uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getAccessibleChild( sal_Int64 ) { throw lang::IndexOutOfBoundsException(); } @@ -607,12 +622,12 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ThumbnailViewItemAcc::getA return xRet; } -sal_Int32 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ThumbnailViewItemAcc::getAccessibleIndexInParent() { const SolarMutexGuard aSolarGuard; // The index defaults to -1 to indicate the child does not belong to its // parent. - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if( mpParent ) { diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 7a0608e682b1..11f5cf4fa3b6 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -79,10 +79,10 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) 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; @@ -102,13 +102,13 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) 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 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; // XUnoTunnel static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); @@ -183,10 +183,10 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) 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; diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 63de6e0d6ea3..f94ee353ce58 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -242,13 +242,13 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground() return static_cast<sal_Int32>(nCol); } -sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleChildCount() +sal_Int64 SAL_CALL SmGraphicAccessible::getAccessibleChildCount() { return 0; } Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleChild( - sal_Int32 /*i*/ ) + sal_Int64 /*i*/ ) { throw IndexOutOfBoundsException(); // there is no child... } @@ -262,12 +262,12 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent() return pWin->GetDrawingArea()->get_accessible_parent(); } -sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() +sal_Int64 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() { SolarMutexGuard aGuard; // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; css::uno::Reference<css::accessibility::XAccessible> xParent(getAccessibleParent()); if (!xParent) @@ -281,8 +281,8 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() // iterate over parent's children and search for this object if (xParentContext.is()) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for (sal_Int32 nChild = 0; (nChild < nChildCount) && (-1 == nRet); ++nChild) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for (sal_Int64 nChild = 0; (nChild < nChildCount) && (-1 == nRet); ++nChild) { css::uno::Reference<css::accessibility::XAccessible> xChild( xParentContext->getAccessibleChild(nChild)); diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index f462557d100d..fd41e5a32146 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -90,10 +90,10 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) 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; diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 2ad8d14a4213..6bb9b63e4b07 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -122,7 +122,7 @@ bool SvtRulerAccessible::isVisible() } //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() +sal_Int64 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -131,7 +131,7 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleChildCount() return 0; } -uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleChild( sal_Int32 ) +uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleChild( sal_Int64 ) { uno::Reference< XAccessible > xChild ; @@ -143,7 +143,7 @@ uno::Reference< XAccessible > SAL_CALL SvtRulerAccessible::getAccessibleParent() return mxParent; } -sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() +sal_Int64 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -154,8 +154,8 @@ sal_Int32 SAL_CALL SvtRulerAccessible::getAccessibleIndexInParent() uno::Reference< XAccessibleContext > xParentContext( mxParent->getAccessibleContext() ); if( xParentContext.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for( sal_Int32 i = 0 ; i < nChildCount ; ++i ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for( sal_Int64 i = 0 ; i < nChildCount ; ++i ) { uno::Reference< XAccessible > xChild( xParentContext->getAccessibleChild( i ) ); if( xChild.get() == static_cast<XAccessible*>(this) ) diff --git a/svtools/source/control/accessibleruler.hxx b/svtools/source/control/accessibleruler.hxx index 63f4739a3bc3..1eb4ad77d541 100644 --- a/svtools/source/control/accessibleruler.hxx +++ b/svtools/source/control/accessibleruler.hxx @@ -89,16 +89,16 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild( sal_Int32 nIndex ) override; + getAccessibleChild( sal_Int64 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 0a575c6ea3d6..869724b36827 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -103,13 +103,13 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAc } -sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount() +sal_Int64 SAL_CALL ValueItemAcc::getAccessibleChildCount() { return 0; } -uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int64 ) { throw lang::IndexOutOfBoundsException(); } @@ -127,12 +127,12 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl } -sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ValueItemAcc::getAccessibleIndexInParent() { const SolarMutexGuard aSolarGuard; // The index defaults to -1 to indicate the child does not belong to its // parent. - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; if( mpParent ) { @@ -507,22 +507,26 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc } -sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount() +sal_Int64 SAL_CALL ValueSetAcc::getAccessibleChildCount() { const SolarMutexGuard aSolarGuard; ThrowIfDisposed(); - sal_Int32 nCount = mpParent->ImplGetVisibleItemCount(); + sal_Int64 nCount = mpParent->ImplGetVisibleItemCount(); if (HasNoneField()) nCount += 1; return nCount; } -uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int64 i ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (i < 0 || i >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(i)); if( !pItem ) @@ -539,13 +543,13 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible return mpParent->GetDrawingArea()->get_accessible_parent(); } -sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; uno::Reference<accessibility::XAccessible> xParent(getAccessibleParent()); if (!xParent) @@ -558,8 +562,8 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent() // iterate over parent's children and search for this object if ( xParentContext.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for ( sal_Int32 nChild = 0; ( nChild < nChildCount ) && ( -1 == nRet ); ++nChild ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for ( sal_Int64 nChild = 0; ( nChild < nChildCount ) && ( -1 == nRet ); ++nChild ) { uno::Reference<XAccessible> xChild(xParentContext->getAccessibleChild(nChild)); if ( xChild.get() == this ) @@ -814,10 +818,14 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground( ) return static_cast<sal_Int32>(nColor); } -void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int64 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); if(pItem == nullptr) @@ -827,10 +835,14 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex ) } -sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int64 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + ValueSetItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); if (pItem == nullptr) @@ -856,11 +868,11 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren() } -sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - sal_Int32 nRet = 0; + sal_Int64 nRet = 0; for( sal_uInt16 i = 0, nCount = getItemCount(); i < nCount; i++ ) { @@ -874,7 +886,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount() } -uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; @@ -884,7 +896,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc { ValueSetItem* pItem = getItem(i); - if( pItem && mpParent->IsItemSelected( pItem->mnId ) && ( nSelectedChildIndex == static_cast< sal_Int32 >( nSel++ ) ) ) + if( pItem && mpParent->IsItemSelected( pItem->mnId ) && ( nSelectedChildIndex == static_cast< sal_Int64 >( nSel++ ) ) ) xRet = pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ); } @@ -892,10 +904,14 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc } -void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int64 nChildIndex ) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + // Because of the single selection we can reset the whole selection when // the specified child is currently selected. if (isAccessibleChildSelected(nChildIndex)) diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index 3f7130caa14d..21e65305914b 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -107,10 +107,10 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) 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; @@ -130,13 +130,13 @@ public: virtual sal_Int32 SAL_CALL getBackground( ) 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 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; // XUnoTunnel static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); @@ -221,10 +221,10 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) 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; diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index eee79cac6cdd..12d7756e924b 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -58,8 +58,8 @@ public: virtual void SAL_CALL release( ) noexcept 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 sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleTable @@ -79,18 +79,18 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) 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; // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ; @@ -112,7 +112,7 @@ public: friend class AccessibleTableHeaderShape; /// @throws css::lang::IndexOutOfBoundsException - void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ); + void getColumnAndRow( sal_Int64 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ); // overwrite the SetState & ResetState to do special operation for table cell's internal text virtual bool SetState (sal_Int64 aState) override; virtual bool ResetState (sal_Int64 aState) override; @@ -131,7 +131,7 @@ private: void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ); rtl::Reference< AccessibleTableShapeImpl > mxImpl; - sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const; + sal_Int64 GetIndexOfSelectedChild( sal_Int64 nSelectedChildIndex ) const; }; typedef ::cppu::WeakImplHelper< @@ -156,10 +156,10 @@ 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; @@ -195,9 +195,9 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ; diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index f8cdc3ce9029..bf085bb753a4 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -492,7 +492,7 @@ bool AccessibleControlShape::ensureListeningState( return _bNeedNewListening; } -sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) +sal_Int64 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) { if ( !m_xUnoControl.is() ) return 0; @@ -509,7 +509,7 @@ sal_Int32 SAL_CALL AccessibleControlShape::getAccessibleChildCount( ) } } -Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sal_Int64 i ) { Reference< XAccessible > xChild; if ( !m_xUnoControl.is() ) @@ -527,7 +527,7 @@ Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sa // of the context of our UNO control Reference< XAccessibleContext > xControlContext( m_aControlContext ); - OSL_ENSURE( xControlContext.is(), "AccessibleControlShape::getAccessibleChildCount: control context already dead! How this!" ); + OSL_ENSURE( xControlContext.is(), "AccessibleControlShape::getAccessibleChild: control context already dead! How this!" ); if ( xControlContext.is() ) { Reference< XAccessible > xInnerChild( xControlContext->getAccessibleChild( i ) ); @@ -541,7 +541,7 @@ Reference< XAccessible > SAL_CALL AccessibleControlShape::getAccessibleChild( sa } #if OSL_DEBUG_LEVEL > 0 - sal_Int32 nChildIndex = -1; + sal_Int64 nChildIndex = -1; Reference< XAccessibleContext > xContext; if ( xChild.is() ) xContext = xChild->getAccessibleContext( ); diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 9816c7c8d4dd..e7eb4f9a9a0b 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -20,6 +20,7 @@ #include <AccessibleFrameSelector.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> +#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -31,6 +32,7 @@ namespace svx::a11y { using ::com::sun::star::uno::Any; +using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::RuntimeException; @@ -55,17 +57,21 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext( ) return this; } -sal_Int32 AccFrameSelector::getAccessibleChildCount( ) +sal_Int64 AccFrameSelector::getAccessibleChildCount( ) { SolarMutexGuard aGuard; IsValid(); return mpFrameSel->GetEnabledBorderCount(); } -Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int64 i ) { SolarMutexGuard aGuard; IsValid(); + + if (i < 0 || i >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + Reference< XAccessible > xRet = mpFrameSel->GetChildAccessible( i ); if( !xRet.is() ) throw RuntimeException(); @@ -238,14 +244,14 @@ Reference< XAccessibleContext > AccFrameSelectorChild::getAccessibleContext( ) return this; } -sal_Int32 AccFrameSelectorChild::getAccessibleChildCount( ) +sal_Int64 AccFrameSelectorChild::getAccessibleChildCount( ) { SolarMutexGuard aGuard; IsValid(); return 0; } -Reference< XAccessible > AccFrameSelectorChild::getAccessibleChild( sal_Int32 ) +Reference< XAccessible > AccFrameSelectorChild::getAccessibleChild( sal_Int64 ) { throw RuntimeException(); } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index af39510e5faa..1c1f964f971a 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -297,7 +297,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription() /** The children of this shape come from two sources: The children from group or scene shapes and the paragraphs of text. */ -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleShape::getAccessibleChildCount () { if (IsDisposed()) @@ -305,7 +305,7 @@ sal_Int32 SAL_CALL return 0; } - sal_Int32 nChildCount = 0; + sal_Int64 nChildCount = 0; // Add the number of shapes that are children of this shape. if (mpChildrenManager != nullptr) @@ -322,7 +322,7 @@ sal_Int32 SAL_CALL an exception for a wrong index. */ uno::Reference<XAccessible> SAL_CALL - AccessibleShape::getAccessibleChild (sal_Int32 nIndex) + AccessibleShape::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); @@ -337,7 +337,7 @@ uno::Reference<XAccessible> SAL_CALL } else if (mpText != nullptr) { - sal_Int32 nI = nIndex; + sal_Int64 nI = nIndex; if (mpChildrenManager != nullptr) nI -= mpChildrenManager->GetChildCount(); xChild = mpText->GetChild (nI); @@ -437,8 +437,8 @@ uno::Reference<XAccessible > SAL_CALL { ::osl::MutexGuard aGuard (m_aMutex); - sal_Int32 nChildCount = getAccessibleChildCount (); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount = getAccessibleChildCount (); + for (sal_Int64 i = 0; i < nChildCount; ++i) { Reference<XAccessible> xChild (getAccessibleChild (i)); if (xChild.is()) @@ -735,12 +735,12 @@ void SAL_CALL } // XAccessibleSelection -void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 ) +void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int64 ) { } -sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int64 nChildIndex ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -782,23 +782,22 @@ void SAL_CALL AccessibleShape::selectAllAccessibleChildren( ) } -sal_Int32 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount() { - sal_Int32 nCount = 0; - sal_Int32 TotalCount = getAccessibleChildCount(); - for( sal_Int32 i = 0; i < TotalCount; i++ ) + sal_Int64 nCount = 0; + sal_Int64 TotalCount = getAccessibleChildCount(); + for( sal_Int64 i = 0; i < TotalCount; i++ ) if( isAccessibleChildSelected(i) ) nCount++; return nCount; } -Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); - sal_Int32 i1, i2; - for( i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) + for (sal_Int64 i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++) if( isAccessibleChildSelected(i1) ) { if( i2 == nSelectedChildIndex ) @@ -809,7 +808,7 @@ Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal } -void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 ) +void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int64 ) { } @@ -1018,13 +1017,13 @@ void AccessibleShape::disposing() AccessibleContextBase::dispose (); } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleShape::getAccessibleIndexInParent() { ThrowIfDisposed (); // Use a simple but slow solution for now. Optimize later. - sal_Int32 nIndex = m_nIndexInParent; + sal_Int64 nIndex = m_nIndexInParent; if ( -1 == nIndex ) nIndex = AccessibleContextBase::getAccessibleIndexInParent(); return nIndex; diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index edb644640433..27ad6747500b 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -87,8 +87,8 @@ namespace accessibility virtual ~AccessibleTextHelper_Impl() override; // XAccessibleContext child handling methods - sal_Int32 getAccessibleChildCount() const; - uno::Reference< XAccessible > getAccessibleChild( sal_Int32 i ); + sal_Int64 getAccessibleChildCount() const; + uno::Reference< XAccessible > getAccessibleChild( sal_Int64 i ); // XAccessibleEventBroadcaster child related methods void addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ); @@ -1429,12 +1429,12 @@ namespace accessibility } // XAccessibleContext - sal_Int32 AccessibleTextHelper_Impl::getAccessibleChildCount() const + sal_Int64 AccessibleTextHelper_Impl::getAccessibleChildCount() const { return mnLastVisibleChild - mnFirstVisibleChild + 1; } - uno::Reference< XAccessible > AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) + uno::Reference< XAccessible > AccessibleTextHelper_Impl::getAccessibleChild( sal_Int64 i ) { i -= GetStartIndex(); @@ -1500,7 +1500,7 @@ namespace accessibility Point aLogPoint( GetViewForwarder().PixelToLogic( aPoint, rCacheTF.GetMapMode() ) ); // iterate over all visible children (including those not yet created) - sal_Int32 nChild; + sal_Int64 nChild; for( nChild=mnFirstVisibleChild; nChild <= mnLastVisibleChild; ++nChild ) { DBG_ASSERT(nChild >= 0, @@ -1696,14 +1696,14 @@ namespace accessibility } // XAccessibleContext - sal_Int32 AccessibleTextHelper::GetChildCount() const + sal_Int64 AccessibleTextHelper::GetChildCount() const { SolarMutexGuard aGuard; #ifdef DBG_UTIL mpImpl->CheckInvariants(); - sal_Int32 nRet = mpImpl->getAccessibleChildCount(); + sal_Int64 nRet = mpImpl->getAccessibleChildCount(); mpImpl->CheckInvariants(); @@ -1713,7 +1713,7 @@ namespace accessibility #endif } - uno::Reference< XAccessible > AccessibleTextHelper::GetChild( sal_Int32 i ) + uno::Reference< XAccessible > AccessibleTextHelper::GetChild( sal_Int64 i ) { SolarMutexGuard aGuard; diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 8b08b930dc7b..2cac5153a5a4 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -49,17 +49,17 @@ ChildrenManager::~ChildrenManager() SAL_INFO("svx", "~ChildrenManager"); } -tools::Long ChildrenManager::GetChildCount() const noexcept +sal_Int64 ChildrenManager::GetChildCount() const noexcept { return mpImpl->GetChildCount(); } -css::uno::Reference<XAccessible> ChildrenManager::GetChild (tools::Long nIndex) +css::uno::Reference<XAccessible> ChildrenManager::GetChild (sal_Int64 nIndex) { return mpImpl->GetChild (nIndex); } -const css::uno::Reference<css::drawing::XShape>& ChildrenManager::GetChildShape(tools::Long nIndex) +const css::uno::Reference<css::drawing::XShape>& ChildrenManager::GetChildShape(sal_Int64 nIndex) { return mpImpl->GetChildShape(nIndex); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 36fa9ffecdb9..36390c7a033b 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -108,13 +108,13 @@ void ChildrenManagerImpl::Init() } -tools::Long ChildrenManagerImpl::GetChildCount() const noexcept +sal_Int64 ChildrenManagerImpl::GetChildCount() const noexcept { return maVisibleChildren.size(); } -const css::uno::Reference<css::drawing::XShape>& ChildrenManagerImpl::GetChildShape(tools::Long nIndex) +const css::uno::Reference<css::drawing::XShape>& ChildrenManagerImpl::GetChildShape(sal_Int64 nIndex) { // Check whether the given index is valid. if (nIndex < 0 || o3tl::make_unsigned(nIndex) >= maVisibleChildren.size()) @@ -128,7 +128,7 @@ const css::uno::Reference<css::drawing::XShape>& ChildrenManagerImpl::GetChildSh yet in the cache. */ uno::Reference<XAccessible> - ChildrenManagerImpl::GetChild (tools::Long nIndex) + ChildrenManagerImpl::GetChild (sal_Int64 nIndex) { // Check whether the given index is valid. if (nIndex < 0 || o3tl::make_unsigned(nIndex) >= maVisibleChildren.size()) @@ -800,8 +800,8 @@ bool ChildrenManagerImpl::ReplaceChild ( // Add the impl method for IAccessibleParent interface AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) { - sal_Int32 count = GetChildCount(); - for (sal_Int32 index=0;index<count;index++) + sal_Int64 count = GetChildCount(); + for (sal_Int64 index=0;index<count;index++) { AccessibleShape* pAccShape = maVisibleChildren[index].GetAccessibleShape(); if (pAccShape && ::accessibility::ShapeTypeHandler::Instance().GetTypeId(pAccShape->GetXShape()) == DRAWING_CONTROL) diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 517530fa64e7..2de34e10da16 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -115,11 +115,11 @@ public: @return If there are no children a 0 is returned. */ - tools::Long GetChildCount() const noexcept; + sal_Int64 GetChildCount() const noexcept; /// @throws css::uno::RuntimeException /// @throws css::lang::IndexOutOfBoundsException - const css::uno::Reference<css::drawing::XShape>& GetChildShape(tools::Long nIndex); + const css::uno::Reference<css::drawing::XShape>& GetChildShape(sal_Int64 nIndex); /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @param nIndex @@ -134,7 +134,7 @@ public: Throws an IndexOutOfBoundsException if the index is not valid. */ css::uno::Reference<css::accessibility::XAccessible> - GetChild (tools::Long nIndex); + GetChild (sal_Int64 nIndex); /** Return the requested accessible child. @param aChildDescriptor diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 66189cf80c40..5662e1fdffc6 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -269,7 +269,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() } // XAccessibleContext -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() +sal_Int64 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() { ::SolarMutexGuard aGuard; @@ -281,7 +281,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() /** returns the SdrObject at index nIndex from the model of this graph */ -SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex ) +SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int64 nIndex ) { ::SolarMutexGuard aGuard; @@ -311,7 +311,7 @@ void SvxGraphCtrlAccessibleContext::CommitChange ( comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent ); } -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int64 nIndex ) { ::SolarMutexGuard aGuard; @@ -328,7 +328,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessiblePa return mpControl->GetDrawingArea()->get_accessible_parent(); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() +sal_Int64 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() { ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. @@ -340,8 +340,8 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() Reference< XAccessibleContext > xParentContext( xParent->getAccessibleContext() ); if( xParentContext.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for( sal_Int32 i = 0 ; i < nChildCount ; ++i ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for( sal_Int64 i = 0 ; i < nChildCount ; ++i ) { Reference< XAccessible > xChild( xParentContext->getAccessibleChild( i ) ); if( xChild.is() ) @@ -515,13 +515,16 @@ OUString SvxGraphCtrlAccessibleContext::getServiceName() } // XAccessibleSelection -void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nIndex ) +void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int64 nIndex ) { ::SolarMutexGuard aGuard; if( nullptr == mpView ) throw DisposedException(); + if (nIndex < 0 || nIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + SdrObject* pObj = getSdrObject( nIndex ); if( pObj ) @@ -529,13 +532,16 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI } -sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) +sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int64 nIndex ) { ::SolarMutexGuard aGuard; if( nullptr == mpView ) throw DisposedException(); + if (nIndex < 0 || nIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + return mpView->IsObjMarked( getSdrObject( nIndex ) ); } @@ -562,7 +568,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() { ::SolarMutexGuard aGuard; @@ -570,11 +576,11 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun throw DisposedException(); const SdrMarkList& rList = mpView->GetMarkedObjectList(); - return static_cast<sal_Int32>(rList.GetMarkCount()); + return static_cast<sal_Int64>(rList.GetMarkCount()); } -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int64 nIndex ) { ::SolarMutexGuard aGuard; @@ -591,7 +597,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce } -void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) +void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int64 nIndex ) { ::SolarMutexGuard aGuard; @@ -620,7 +626,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 } // internals -void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection( tools::Long nIndex ) +void SvxGraphCtrlAccessibleContext::checkChildIndexOnSelection(sal_Int64 nIndex ) { if( nIndex < 0 || nIndex >= getSelectedAccessibleChildCount() ) throw lang::IndexOutOfBoundsException(); diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index adbda3a3957d..9896262d615e 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -94,15 +94,21 @@ void SAL_CALL SvxShowCharSetAcc::disposing() IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base ) -bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) +bool SvxShowCharSetAcc::implIsSelected( sal_Int64 nAccessibleChildIndex ) { + if (nAccessibleChildIndex < 0 || nAccessibleChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + return m_pParent && m_pParent->IsSelected( sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex)); } // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) -void SvxShowCharSetAcc::implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect) +void SvxShowCharSetAcc::implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) { + if (nAccessibleChildIndex < 0 || nAccessibleChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + if ( m_pParent ) { if ( bSelect ) @@ -130,14 +136,14 @@ css::awt::Rectangle SvxShowCharSetAcc::implGetBounds() return aRet; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() +sal_Int64 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); return m_pParent->getMaxCharCount(); } -uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i ) +uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -338,19 +344,19 @@ sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_I return m_pParent->GetSelectIndexId() == getAccessibleIndex(nRow,nColumn); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { - return (nRow*COLUMN_COUNT) + nColumn; + return (static_cast<sal_Int64>(nRow) * COLUMN_COUNT) + nColumn; } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); return SvxShowCharSet::GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } -sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int64 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -383,13 +389,13 @@ void SvxShowCharSetItemAcc::ParentDestroyed() mpParent = nullptr; } -sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() +sal_Int64 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount() { return 0; } -uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ ) +uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int64 /*i*/ ) { throw lang::IndexOutOfBoundsException(); } diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index cd1e0a4d5263..d31af4062d49 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -57,12 +57,12 @@ uno::Reference< XAccessibleContext > SvxPixelCtlAccessible::getAccessibleContext return this; } -sal_Int32 SvxPixelCtlAccessible::getAccessibleChildCount( ) +sal_Int64 SvxPixelCtlAccessible::getAccessibleChildCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); return SvxPixelCtl::GetSquares(); } -uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int32 i ) +uno::Reference< XAccessible > SvxPixelCtlAccessible::getAccessibleChild( sal_Int64 i ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( i < 0 || i >= getAccessibleChildCount()) @@ -190,7 +190,7 @@ sal_Int32 SvxPixelCtlAccessible::getBackground( ) return sal_Int32(rStyles.GetDialogColor()); } -void SvxPixelCtlAccessible::implSelect(sal_Int32 nChildIndex, bool bSelect) +void SvxPixelCtlAccessible::implSelect(sal_Int64 nChildIndex, bool bSelect) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -204,7 +204,7 @@ void SvxPixelCtlAccessible::implSelect(sal_Int32 nChildIndex, bool bSelect) NotifyChild(nIndex, bSelect, false); } -bool SvxPixelCtlAccessible::implIsSelected(sal_Int32 nChildIndex) +bool SvxPixelCtlAccessible::implIsSelected(sal_Int64 nChildIndex) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -359,12 +359,12 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground() } // XAccessibleContext -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() +sal_Int64 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() { return 0; } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChild( sal_Int32 ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChild( sal_Int64 ) { throw lang::IndexOutOfBoundsException(); } diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 550ea079cdda..9586330127b5 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -130,14 +130,14 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleAtPo } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() +sal_Int64 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() { ::osl::MutexGuard aGuard( m_aMutex ); return SvxRectCtl::NO_CHILDREN; } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChild( sal_Int64 nIndex ) { checkChildIndex( nIndex ); @@ -262,7 +262,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) } // XAccessibleSelection -void SvxRectCtlAccessibleContext::implSelect(sal_Int32 nIndex, bool bSelect) +void SvxRectCtlAccessibleContext::implSelect(sal_Int64 nIndex, bool bSelect) { ::SolarMutexGuard aSolarGuard; @@ -288,7 +288,7 @@ void SvxRectCtlAccessibleContext::implSelect(sal_Int32 nIndex, bool bSelect) } } -bool SvxRectCtlAccessibleContext::implIsSelected( sal_Int32 nIndex ) +bool SvxRectCtlAccessibleContext::implIsSelected( sal_Int64 nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -298,7 +298,7 @@ bool SvxRectCtlAccessibleContext::implIsSelected( sal_Int32 nIndex ) } // internals -void SvxRectCtlAccessibleContext::checkChildIndex( tools::Long nIndex ) +void SvxRectCtlAccessibleContext::checkChildIndex( sal_Int64 nIndex ) { if( nIndex < 0 || nIndex >= getAccessibleChildCount() ) throw lang::IndexOutOfBoundsException(); @@ -449,12 +449,12 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() +sal_Int64 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() { return 0; } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int32 /*nIndex*/ ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChild( sal_Int64 /*nIndex*/ ) { throw lang::IndexOutOfBoundsException(); } diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx index 8b85ea1a53ed..3cfd53d707bb 100644 --- a/svx/source/dialog/weldeditview.cxx +++ b/svx/source/dialog/weldeditview.cxx @@ -666,7 +666,7 @@ public: } // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override { if (m_xTextHelper) return m_xTextHelper->GetChildCount(); @@ -674,7 +674,7 @@ public: } virtual css::uno::Reference<css::accessibility::XAccessible> - SAL_CALL getAccessibleChild(sal_Int32 i) override + SAL_CALL getAccessibleChild(sal_Int64 i) override { if (m_xTextHelper) return m_xTextHelper->GetChild(i); @@ -691,14 +691,14 @@ public: return m_pController->GetDrawingArea()->get_accessible_parent(); } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override { SolarMutexGuard aGuard; if (!m_pController) throw css::uno::RuntimeException(); // -1 for child not found/no parent (according to specification) - sal_Int32 nRet = -1; + sal_Int64 nRet = -1; css::uno::Reference<css::accessibility::XAccessible> xParent(getAccessibleParent()); if (!xParent) @@ -712,8 +712,8 @@ public: // iterate over parent's children and search for this object if (xParentContext.is()) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for (sal_Int32 nChild = 0; (nChild < nChildCount) && (-1 == nRet); ++nChild) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for (sal_Int64 nChild = 0; (nChild < nChildCount) && (-1 == nRet); ++nChild) { css::uno::Reference<css::accessibility::XAccessible> xChild( xParentContext->getAccessibleChild(nChild)); diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 46083e4aade5..7497b438398f 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -49,8 +49,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; @@ -94,8 +94,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 03bd43e1a09d..094d9bd18ba5 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -98,10 +98,10 @@ public: virtual sal_Int32 SAL_CALL getBackground() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int64 nIndex) 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; @@ -125,13 +125,13 @@ public: virtual OUString SAL_CALL getServiceName() 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 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; // IAccessibleViewforwarder virtual tools::Rectangle GetVisibleArea() const override; @@ -146,13 +146,13 @@ public: private: virtual ~SvxGraphCtrlAccessibleContext() override; /// @throws css::lang::IndexOutOfBoundsException - void checkChildIndexOnSelection( tools::Long nIndexOfChild ); + void checkChildIndexOnSelection(sal_Int64 nIndexOfChild ); virtual void SAL_CALL disposing() final override; /// @throws css::uno::RuntimeException /// @throws css::lang::IndexOutOfBoundsException - SdrObject* getSdrObject( sal_Int32 nIndex ); + SdrObject* getSdrObject( sal_Int64 nIndex ); void CommitChange (sal_Int16 aEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue); diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 013c1da1c57d..1924a77578a5 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -85,8 +85,8 @@ namespace svx //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; @@ -115,9 +115,9 @@ namespace svx virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; void fireEvent( @@ -137,11 +137,11 @@ namespace svx // OCommonAccessibleSelection // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) override; + implIsSelected( sal_Int64 nAccessibleChildIndex ) override; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; + implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; // OCommonAccessibleComponent /// implements the calculation of the bounding rectangle - still waiting to be overwritten @@ -184,8 +184,8 @@ namespace svx //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index b9c738605b11..20b9b9d0b251 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -59,8 +59,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; @@ -111,8 +111,8 @@ public: //XAccessible //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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; @@ -132,10 +132,10 @@ private: // OCommonAccessibleSelection // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) - virtual bool implIsSelected(sal_Int32 nAccessibleChildIndex) override; + virtual bool implIsSelected(sal_Int64 nAccessibleChildIndex) override; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) - virtual void implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect) override; + virtual void implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) override; // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds() override; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 66c9cc51ecbb..2d6967e22784 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -61,8 +61,8 @@ public: // XAccessible // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int64 nIndex) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; virtual OUString SAL_CALL getAccessibleDescription() override; @@ -90,17 +90,17 @@ private: // OCommonAccessibleSelection // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) - virtual bool implIsSelected(sal_Int32 nAccessibleChildIndex) override; + virtual bool implIsSelected(sal_Int64 nAccessibleChildIndex) override; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) - virtual void implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect) override; + virtual void implSelect(sal_Int64 nAccessibleChildIndex, bool bSelect) override; // OCommonAccessibleComponent virtual css::awt::Rectangle implGetBounds() override; virtual void SAL_CALL disposing() override; - void checkChildIndex(tools::Long nIndex); + void checkChildIndex(sal_Int64 nIndex); /** Selects a new child by index. @@ -154,8 +154,8 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; virtual sal_Int16 SAL_CALL getAccessibleRole() override; virtual OUString SAL_CALL getAccessibleDescription() override; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 1d6321084b22..98c83c48df86 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -151,7 +151,7 @@ void SAL_CALL AccessibleCell::release( ) noexcept /** The children of this cell come from the paragraphs of text. */ -sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleCell::getAccessibleChildCount() { SolarMutexGuard aSolarGuard; ThrowIfDisposed (); @@ -162,7 +162,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() /** Forward the request to the shape. Return the requested shape or throw an exception for a wrong index. */ -Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nIndex) +Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int64 nIndex) { SolarMutexGuard aSolarGuard; ThrowIfDisposed (); @@ -249,8 +249,8 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const c SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (m_aMutex); - sal_Int32 nChildCount = getAccessibleChildCount (); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount = getAccessibleChildCount (); + for (sal_Int64 i = 0; i < nChildCount; ++i) { Reference<XAccessible> xChild (getAccessibleChild (i)); if (xChild.is()) @@ -496,7 +496,7 @@ void AccessibleCell::disposing() AccessibleContextBase::dispose (); } -sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleCell::getAccessibleIndexInParent() { ThrowIfDisposed (); return mnIndexInParent; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index d926e0bec704..e57616f5789d 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -63,10 +63,10 @@ public: virtual void SAL_CALL release( ) noexcept override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int64 nIndex) override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual OUString SAL_CALL getAccessibleName() override; const sdr::table::CellRef& getCellRef() const { return mxCell;} void UpdateChildren(); diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 50d213fda3e9..24880596af69 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -67,9 +67,9 @@ public: /// @throws IndexOutOfBoundsException /// @throws RuntimeException - Reference< XAccessible > getAccessibleChild(sal_Int32 i); + Reference< XAccessible > getAccessibleChild(sal_Int64 i); /// @throws IndexOutOfBoundsException - void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ); + void getColumnAndRow( sal_Int64 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ); // XModifyListener virtual void SAL_CALL modified( const EventObject& aEvent ) override; @@ -170,7 +170,7 @@ rtl::Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (sa } -Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 nChildIndex) +Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int64 nChildIndex) { sal_Int32 nColumn = 0, nRow = 0; getColumnAndRow( nChildIndex, nColumn, nRow ); @@ -197,7 +197,7 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild(sal_Int32 } -void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) +void AccessibleTableShapeImpl::getColumnAndRow( sal_Int64 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) { if( mxTable.is() ) { @@ -403,14 +403,14 @@ OUString AccessibleTableShape::CreateAccessibleBaseName() } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) +sal_Int64 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; - return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0; + return mxImpl->mxTable.is() ? static_cast<sal_Int64>(mxImpl->mxTable->getRowCount()) * static_cast<sal_Int64>(mxImpl->mxTable->getColumnCount()) : 0; } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int64 i ) { SolarMutexGuard aSolarGuard; ThrowIfDisposed(); @@ -667,15 +667,15 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aSolarGuard; checkCellPosition( nColumn, nRow ); - return mxImpl->mxTable.is() ? (nRow * mxImpl->mxTable->getColumnCount() + nColumn) : 0; + return mxImpl->mxTable.is() ? (static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(mxImpl->mxTable->getColumnCount()) + nColumn) : 0; } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; sal_Int32 nColumn = 0, nRow = 0; @@ -684,7 +684,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex } -sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; sal_Int32 nColumn = 0, nRow = 0; @@ -696,7 +696,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn // XAccessibleSelection -void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; CellPos aPos; @@ -721,9 +721,13 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex } -sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; + + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw IndexOutOfBoundsException(); + CellPos aPos; mxImpl->getColumnAndRow( nChildIndex, aPos.mnCol, aPos.mnRow ); @@ -752,7 +756,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() } -sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() { SolarMutexGuard aSolarGuard; @@ -764,21 +768,21 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() const sal_Int32 nSelectedColumns = std::max( sal_Int32(0), aLastPos.mnCol - aFirstPos.mnCol ) + 1; const sal_Int32 nSelectedRows = std::max( sal_Int32(0), aLastPos.mnRow - aFirstPos.mnRow ) + 1; - return nSelectedRows * nSelectedColumns; + return static_cast<sal_Int64>(nSelectedRows) * static_cast<sal_Int64>(nSelectedColumns); } return 0; } -Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; if( nSelectedChildIndex < 0 ) throw IndexOutOfBoundsException(); - sal_Int32 nChildIndex = GetIndexOfSelectedChild( nSelectedChildIndex ); + sal_Int64 nChildIndex = GetIndexOfSelectedChild( nSelectedChildIndex ); if( nChildIndex < 0 ) throw IndexOutOfBoundsException(); @@ -792,7 +796,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi } -void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aSolarGuard; CellPos aPos; @@ -856,15 +860,15 @@ sal_Bool SAL_CALL AccessibleTableShape::unselectColumn( sal_Int32 column ) return pController->deselectColumn( column ); } -sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild( - sal_Int32 nSelectedChildIndex ) const +sal_Int64 AccessibleTableShape::GetIndexOfSelectedChild( + sal_Int64 nSelectedChildIndex ) const { - sal_Int32 nChildren = const_cast<AccessibleTableShape*>(this)->getAccessibleChildCount(); + sal_Int64 nChildren = const_cast<AccessibleTableShape*>(this)->getAccessibleChildCount(); if( nSelectedChildIndex >= nChildren ) return -1; - sal_Int32 n = 0; + sal_Int64 n = 0; while( n < nChildren ) { if( const_cast<AccessibleTableShape*>(this)->isAccessibleChildSelected( n ) ) @@ -879,7 +883,7 @@ sal_Int32 AccessibleTableShape::GetIndexOfSelectedChild( return n < nChildren ? n : -1; } -void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) +void AccessibleTableShape::getColumnAndRow( sal_Int64 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) { mxImpl->getColumnAndRow(nChildIndex, rnColumn, rnRow); } @@ -901,7 +905,7 @@ void SAL_CALL AccessibleTableShape::selectionChanged (const EventObject& rEvent if (!xAccCell.is()) return; - sal_Int32 nIndex = xAccCell->getAccessibleIndexInParent(), + sal_Int64 nIndex = xAccCell->getAccessibleIndexInParent(), nCount = getSelectedAccessibleChildCount(); bool bSelected = isAccessibleChildSelected(nIndex); if (mnPreviousSelectionCount == 0 && nCount > 0 && bSelected) @@ -1012,12 +1016,12 @@ Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessib } // XAccessibleContext -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleChildCount( ) +sal_Int64 SAL_CALL AccessibleTableHeaderShape::getAccessibleChildCount( ) { - return getAccessibleRowCount() * getAccessibleColumnCount(); + return static_cast<sal_Int64>(getAccessibleRowCount()) * static_cast<sal_Int64>(getAccessibleColumnCount()); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild( sal_Int64 i ) { return mpTable->getAccessibleChild( i ); } @@ -1028,7 +1032,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParen return XParent; } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() { return -1; } @@ -1251,17 +1255,17 @@ sal_Bool SAL_CALL AccessibleTableHeaderShape::isAccessibleSelected( sal_Int32 nR return mpTable->isAccessibleSelected( nRow, nColumn ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { return mpTable->getAccessibleIndex( nRow, nColumn ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleRow( sal_Int64 nChildIndex ) { return mpTable->getAccessibleRow( nChildIndex ); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleColumn( sal_Int64 nChildIndex ) { return mpTable->getAccessibleColumn( nChildIndex ); } @@ -1274,7 +1278,7 @@ sal_Bool SAL_CALL AccessibleTableHeaderShape::selectRow( sal_Int32 row ) else { mpTable->clearAccessibleSelection(); - sal_Int32 nIndex = mpTable->getAccessibleIndex( row, 0 ); + sal_Int64 nIndex = mpTable->getAccessibleIndex( row, 0 ); mpTable->selectAccessibleChild( nIndex ); return true; } @@ -1287,7 +1291,7 @@ sal_Bool SAL_CALL AccessibleTableHeaderShape::selectColumn( sal_Int32 column ) else { mpTable->clearAccessibleSelection(); - sal_Int32 nIndex = mpTable->getAccessibleIndex( 0, column ); + sal_Int64 nIndex = mpTable->getAccessibleIndex( 0, column ); mpTable->selectAccessibleChild( nIndex ); return true; } @@ -1299,7 +1303,7 @@ sal_Bool SAL_CALL AccessibleTableHeaderShape::unselectRow( sal_Int32 row ) return mpTable->unselectRow( row ); else { - sal_Int32 nIndex = mpTable->getAccessibleIndex( row, 0 ); + sal_Int64 nIndex = mpTable->getAccessibleIndex( row, 0 ); mpTable->deselectAccessibleChild( nIndex ); return true; } @@ -1311,7 +1315,7 @@ sal_Bool SAL_CALL AccessibleTableHeaderShape::unselectColumn( sal_Int32 column ) return mpTable->unselectColumn( column ); else { - sal_Int32 nIndex = mpTable->getAccessibleIndex( 0, column ); + sal_Int64 nIndex = mpTable->getAccessibleIndex( 0, column ); mpTable->deselectAccessibleChild( nIndex ); return true; } diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index f30cad55de03..b599e57ead4c 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -431,13 +431,13 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground() // XAccessibleSelection void SwAccessibleCell::selectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { m_aSelectionHelper.selectAccessibleChild(nChildIndex); } sal_Bool SwAccessibleCell::isAccessibleChildSelected( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { return m_aSelectionHelper.isAccessibleChildSelected(nChildIndex); } @@ -451,19 +451,19 @@ void SwAccessibleCell::selectAllAccessibleChildren( ) m_aSelectionHelper.selectAllAccessibleChildren(); } -sal_Int32 SwAccessibleCell::getSelectedAccessibleChildCount( ) +sal_Int64 SwAccessibleCell::getSelectedAccessibleChildCount( ) { return m_aSelectionHelper.getSelectedAccessibleChildCount(); } uno::Reference<XAccessible> SwAccessibleCell::getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { return m_aSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } void SwAccessibleCell::deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { m_aSelectionHelper.deselectAccessibleChild(nSelectedChildIndex); } diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index cfccda65b985..5d607d4c4531 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -118,16 +118,16 @@ public: sal_Int32 SAL_CALL getBackground() override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 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 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; + virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index f9edaa89c893..49f783075128 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -564,7 +564,7 @@ uno::Reference< XAccessibleContext > SAL_CALL return xRet; } -sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount() +sal_Int64 SAL_CALL SwAccessibleContext::getAccessibleChildCount() { SolarMutexGuard aGuard; @@ -574,12 +574,15 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount() } uno::Reference< XAccessible> SAL_CALL - SwAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) + SwAccessibleContext::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; ThrowIfDisposed(); + if (nIndex < 0 || nIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + const SwAccessibleChild aChild( GetChild( *(GetMap()), nIndex ) ); if( !aChild.IsValid() ) { @@ -690,7 +693,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent() return getAccessibleParentImpl(); } -sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent() +sal_Int64 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent() { SolarMutexGuard aGuard; @@ -699,7 +702,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent() const SwFrame *pUpper = GetParent(); OSL_ENSURE( pUpper != nullptr || m_isDisposing, "no upper found" ); - sal_Int32 nIndex = -1; + sal_Int64 nIndex = -1; if( pUpper ) { ::rtl::Reference < SwAccessibleContext > xAccImpl( diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 8bf8daad6c8a..32d13efbf513 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -214,11 +214,11 @@ public: // XAccessibleContext // Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; // Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual css::uno::Sequence<css::uno::Reference< css::accessibility::XAccessible>> SAL_CALL getAccessibleChildren() override; @@ -228,7 +228,7 @@ public: 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/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index e0a0bc983784..618425a68f9d 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -126,13 +126,13 @@ void SwAccessibleDocumentBase::RemoveChild( vcl::Window *pWin ) } } -sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount() +sal_Int64 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount() { SolarMutexGuard aGuard; // ThrowIfDisposed is called by parent - sal_Int32 nChildren = SwAccessibleContext::getAccessibleChildCount(); + sal_Int64 nChildren = SwAccessibleContext::getAccessibleChildCount(); if( !IsDisposing() && mpChildWin ) nChildren++; @@ -140,7 +140,7 @@ sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount() } uno::Reference< XAccessible> SAL_CALL - SwAccessibleDocumentBase::getAccessibleChild( sal_Int32 nIndex ) + SwAccessibleDocumentBase::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; @@ -162,15 +162,15 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessiblePar return mxParent; } -sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() +sal_Int64 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent() { SolarMutexGuard aGuard; uno::Reference < XAccessibleContext > xAcc( mxParent->getAccessibleContext() ); uno::Reference < XAccessible > xThis( this ); - sal_Int32 nCount = xAcc->getAccessibleChildCount(); + sal_Int64 nCount = xAcc->getAccessibleChildCount(); - for( sal_Int32 i=0; i < nCount; i++ ) + for( sal_Int64 i=0; i < nCount; i++ ) { try { @@ -469,13 +469,13 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId() // XAccessibleSelection void SwAccessibleDocument::selectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { maSelectionHelper.selectAccessibleChild(nChildIndex); } sal_Bool SwAccessibleDocument::isAccessibleChildSelected( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { return maSelectionHelper.isAccessibleChildSelected(nChildIndex); } @@ -489,20 +489,20 @@ void SwAccessibleDocument::selectAllAccessibleChildren( ) maSelectionHelper.selectAllAccessibleChildren(); } -sal_Int32 SwAccessibleDocument::getSelectedAccessibleChildCount( ) +sal_Int64 SwAccessibleDocument::getSelectedAccessibleChildCount( ) { return maSelectionHelper.getSelectedAccessibleChildCount(); } uno::Reference<XAccessible> SwAccessibleDocument::getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { return maSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } // index has to be treated as global child index. void SwAccessibleDocument::deselectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { maSelectionHelper.deselectAccessibleChild( nChildIndex ); } diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index fca617ceedc5..735dc822cd81 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -49,18 +49,18 @@ public: // XAccessibleContext // Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; // Return the specified child or NULL if index is invalid. 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 description. @@ -145,19 +145,19 @@ 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; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; virtual css::uno::Any SAL_CALL getExtendedAttributes() override; diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 7b8808ed7fea..fc9f67016051 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -2040,8 +2040,8 @@ void SwAccessibleMap::AddGroupContext(const SdrObject *pParentObj, uno::Referenc if (!xContext.is()) return; - sal_Int32 nChildren = xContext->getAccessibleChildCount(); - for(sal_Int32 i = 0; i<nChildren; i++) + sal_Int64 nChildren = xContext->getAccessibleChildCount(); + for(sal_Int64 i = 0; i<nChildren; i++) { uno::Reference < XAccessible > xChild = xContext->getAccessibleChild(i); if (xChild.is()) diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 0d7f7eaa5259..d3194f3dea3c 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -2694,7 +2694,7 @@ sal_Bool SwAccessibleParagraph::setText( const OUString& sText ) // XAccessibleSelection void SwAccessibleParagraph::selectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { ThrowIfDisposed(); @@ -2702,7 +2702,7 @@ void SwAccessibleParagraph::selectAccessibleChild( } sal_Bool SwAccessibleParagraph::isAccessibleChildSelected( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { ThrowIfDisposed(); @@ -2721,7 +2721,7 @@ void SwAccessibleParagraph::selectAllAccessibleChildren( ) m_aSelectionHelper.selectAllAccessibleChildren(); } -sal_Int32 SwAccessibleParagraph::getSelectedAccessibleChildCount( ) +sal_Int64 SwAccessibleParagraph::getSelectedAccessibleChildCount( ) { ThrowIfDisposed(); @@ -2729,7 +2729,7 @@ sal_Int32 SwAccessibleParagraph::getSelectedAccessibleChildCount( ) } uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { ThrowIfDisposed(); @@ -2738,7 +2738,7 @@ uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild( // index has to be treated as global child index. void SwAccessibleParagraph::deselectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { ThrowIfDisposed(); diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 59aac90ed3f0..7c335388579c 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -325,19 +325,19 @@ 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; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; // XAccessibleHypertext virtual sal_Int32 SAL_CALL getHyperLinkCount() override; diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 3d977a965e58..6bced3eaa053 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -74,10 +74,13 @@ void SwAccessibleSelectionHelper::throwIndexOutOfBoundsException() // XAccessibleSelection void SwAccessibleSelectionHelper::selectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; + if (nChildIndex < 0 || nChildIndex >= m_rContext.GetChildCount(*(m_rContext.GetMap()))) + throwIndexOutOfBoundsException(); + // Get the respective child as SwFrame (also do index checking), ... const SwAccessibleChild aChild = m_rContext.GetChild( *(m_rContext.GetMap()), nChildIndex ); @@ -124,10 +127,13 @@ static bool lcl_getSelectedState(const SwAccessibleChild& aChild, } bool SwAccessibleSelectionHelper::isAccessibleChildSelected( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; + if (nChildIndex < 0 || nChildIndex >= m_rContext.GetChildCount(*(m_rContext.GetMap()))) + throwIndexOutOfBoundsException(); + // Get the respective child as SwFrame (also do index checking), ... const SwAccessibleChild aChild = m_rContext.GetChild( *(m_rContext.GetMap()), nChildIndex ); @@ -185,11 +191,11 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) } } -sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) +sal_Int64 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) { SolarMutexGuard aGuard; - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; // Only one frame can be selected at a time, and we only frames // for selectable children. const SwFEShell* pFEShell = GetFEShell(); @@ -236,7 +242,7 @@ sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) } Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; @@ -327,7 +333,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( // index has to be treated as global child index. void SwAccessibleSelectionHelper::deselectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { SolarMutexGuard g; diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx index ceaa2a7842c3..90cfc303e9dc 100644 --- a/sw/source/core/access/accselectionhelper.hxx +++ b/sw/source/core/access/accselectionhelper.hxx @@ -47,25 +47,25 @@ public: /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void selectAccessibleChild( - sal_Int32 nChildIndex ); + sal_Int64 nChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException bool isAccessibleChildSelected( - sal_Int32 nChildIndex ); + sal_Int64 nChildIndex ); /// @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 ); + sal_Int64 nSelectedChildIndex ); // index has to be treated as global child index. /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException void deselectAccessibleChild( - sal_Int32 nChildIndex ); + sal_Int64 nChildIndex ); }; #endif diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 538eab08d440..46772c4ec732 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -531,7 +531,7 @@ void SwAccessibleTable::FireTableChangeEvent( FireAccessibleEvent( aEvent ); } -const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const +const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int64 nChildIndex ) const { OSL_ENSURE( nChildIndex >= 0, "Illegal child index." ); OSL_ENSURE( nChildIndex < const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(), "Illegal child index." ); // #i77106# @@ -555,7 +555,7 @@ const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const return pBox; } -bool SwAccessibleTable::IsChildSelected( sal_Int32 nChildIndex ) const +bool SwAccessibleTable::IsChildSelected( sal_Int64 nChildIndex ) const { bool bRet = false; const SwSelBoxes* pSelBoxes = GetSelBoxes(); @@ -569,15 +569,15 @@ bool SwAccessibleTable::IsChildSelected( sal_Int32 nChildIndex ) const return bRet; } -sal_Int32 SwAccessibleTable::GetIndexOfSelectedChild( - sal_Int32 nSelectedChildIndex ) const +sal_Int64 SwAccessibleTable::GetIndexOfSelectedChild( + sal_Int64 nSelectedChildIndex ) const { // iterate over all children to n-th isAccessibleChildSelected() - sal_Int32 nChildren = const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(); // #i77106# + sal_Int64 nChildren = const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(); // #i77106# if( nSelectedChildIndex >= nChildren ) return -1; - sal_Int32 n = 0; + sal_Int64 n = 0; while( n < nChildren ) { if( IsChildSelected( n ) ) @@ -778,8 +778,8 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription( "<SwAccessibleTable::getAccessibleRowDescription(..)> - missing row header cell -> serious issue." ); uno::Reference< XAccessibleContext > xRowHeaderCellContext = xRowHeaderCell->getAccessibleContext(); - const sal_Int32 nCellChildCount( xRowHeaderCellContext->getAccessibleChildCount() ); - for ( sal_Int32 nChildIndex = 0; nChildIndex < nCellChildCount; ++nChildIndex ) + const sal_Int64 nCellChildCount( xRowHeaderCellContext->getAccessibleChildCount() ); + for ( sal_Int64 nChildIndex = 0; nChildIndex < nCellChildCount; ++nChildIndex ) { uno::Reference< XAccessible > xChild = xRowHeaderCellContext->getAccessibleChild( nChildIndex ); uno::Reference< XAccessibleText > xChildText( xChild, uno::UNO_QUERY ); @@ -811,8 +811,8 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( "<SwAccessibleTable::getAccessibleColumnDescription(..)> - missing column header cell -> serious issue." ); uno::Reference< XAccessibleContext > xColumnHeaderCellContext = xColumnHeaderCell->getAccessibleContext(); - const sal_Int32 nCellChildCount( xColumnHeaderCellContext->getAccessibleChildCount() ); - for ( sal_Int32 nChildIndex = 0; nChildIndex < nCellChildCount; ++nChildIndex ) + const sal_Int64 nCellChildCount( xColumnHeaderCellContext->getAccessibleChildCount() ); + for ( sal_Int64 nChildIndex = 0; nChildIndex < nCellChildCount; ++nChildIndex ) { uno::Reference< XAccessible > xChild = xColumnHeaderCellContext->getAccessibleChild( nChildIndex ); uno::Reference< XAccessibleText > xChildText( xChild, uno::UNO_QUERY ); @@ -1063,7 +1063,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected( return bRet; } -sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( +sal_Int64 SAL_CALL SwAccessibleTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { sal_Int32 nRet = -1; @@ -1081,7 +1081,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( return nRet; } -sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int64 nChildIndex ) { sal_Int32 nRet = -1; @@ -1118,7 +1118,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { sal_Int32 nRet = -1; @@ -1273,7 +1273,7 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil // XAccessibleSelection void SAL_CALL SwAccessibleTable::selectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; @@ -1352,7 +1352,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( } sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; @@ -1387,17 +1387,17 @@ void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren( ) selectAccessibleChild( getAccessibleChildCount()-1 ); // #i77106# } -sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( ) +sal_Int64 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( ) { SolarMutexGuard aGuard; ThrowIfDisposed(); // iterate over all children and count isAccessibleChildSelected() - sal_Int32 nCount = 0; + sal_Int64 nCount = 0; - sal_Int32 nChildren = getAccessibleChildCount(); // #i71106# - for( sal_Int32 n = 0; n < nChildren; n++ ) + sal_Int64 nChildren = getAccessibleChildCount(); // #i71106# + for( sal_Int64 n = 0; n < nChildren; n++ ) if( IsChildSelected( n ) ) nCount++; @@ -1405,7 +1405,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( ) } uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) + sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; @@ -1415,7 +1415,7 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi if( nSelectedChildIndex < 0 ) throw lang::IndexOutOfBoundsException(); - sal_Int32 nChildIndex = GetIndexOfSelectedChild( nSelectedChildIndex ); + sal_Int64 nChildIndex = GetIndexOfSelectedChild( nSelectedChildIndex ); // parameter checking (part 2): index higher than selected children? if( nChildIndex < 0 ) @@ -1432,7 +1432,7 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi // index has to be treated as global child index. void SAL_CALL SwAccessibleTable::deselectAccessibleChild( - sal_Int32 nChildIndex ) + sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; @@ -1567,8 +1567,8 @@ sal_Bool SAL_CALL SwAccessibleTable::selectRow( sal_Int32 row ) tools::Long lColumnCount = getAccessibleColumnCount(); for(tools::Long lCol = 0; lCol < lColumnCount; lCol ++) { - tools::Long lChildIndex = getAccessibleIndex(row, lCol); - selectAccessibleChild(lChildIndex); + sal_Int64 nChildIndex = getAccessibleIndex(row, lCol); + selectAccessibleChild(nChildIndex); } return true; @@ -1584,8 +1584,8 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn( sal_Int32 column ) for(sal_Int32 lRow = 0; lRow < lRowCount; lRow ++) { - sal_Int32 lChildIndex = getAccessibleIndex(lRow, column); - selectAccessibleChild(lChildIndex); + sal_Int64 nChildIndex = getAccessibleIndex(lRow, column); + selectAccessibleChild(nChildIndex); } return true; } @@ -1665,7 +1665,7 @@ uno::Any SAL_CALL SwAccessibleTableColHeaders::queryInterface( const uno::Type& } // XAccessibleContext -sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount() +sal_Int64 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount() { SolarMutexGuard aGuard; @@ -1702,7 +1702,7 @@ sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount() } uno::Reference< XAccessible> SAL_CALL - SwAccessibleTableColHeaders::getAccessibleChild (sal_Int32 nIndex) + SwAccessibleTableColHeaders::getAccessibleChild (sal_Int64 nIndex) { if ( nIndex < 0 || nIndex >= getAccessibleChildCount() ) { diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 8b3608a3bf90..4b3dd87938e0 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -51,11 +51,11 @@ class SwAccessibleTable : void FireTableChangeEvent( const SwAccessibleTableData_Impl& rTableData ); /** get the SwTableBox* for the given child */ - const SwTableBox* GetTableBox( sal_Int32 ) const; + const SwTableBox* GetTableBox( sal_Int64 ) const; - bool IsChildSelected( sal_Int32 nChildIndex ) const; + bool IsChildSelected( sal_Int64 nChildIndex ) const; - sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const; + sal_Int64 GetIndexOfSelectedChild( sal_Int64 nSelectedChildIndex ) const; protected: // Set states for getAccessibleStateSet. @@ -150,10 +150,10 @@ public: getAccessibleSummary( ) override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; // XAccessibleTableSelection virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override ; @@ -193,23 +193,23 @@ 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; // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; // XAccessibleComponent sal_Int32 SAL_CALL getBackground() override; @@ -250,11 +250,11 @@ public: // XAccessibleContext /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; // XAccessibleTable diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index a5d6d43df622..5b29bb9bca23 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -151,12 +151,12 @@ void SAL_CALL // XAccessibleSelection -void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 ) +void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int64 ) { - SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )> - missing implementation"); + SAL_WARN("sw.a11y", "SwAccessibleTextFrame::selectAccessibleChild - missing implementation"); } -sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard g; @@ -191,24 +191,24 @@ void SAL_CALL SwAccessibleTextFrame::selectAllAccessibleChildren( ) SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAllAccessibleChildren()> - missing implementation"); } -sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount() { - sal_Int32 nCount = 0; - sal_Int32 TotalCount = getAccessibleChildCount(); - for( sal_Int32 i = 0; i < TotalCount; i++ ) + sal_Int64 nCount = 0; + sal_Int64 TotalCount = getAccessibleChildCount(); + for( sal_Int64 i = 0; i < TotalCount; i++ ) if( isAccessibleChildSelected(i) ) nCount++; return nCount; } -uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard g; if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw lang::IndexOutOfBoundsException(); - sal_Int32 i1, i2; - for( i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) + + for(sal_Int64 i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) if( isAccessibleChildSelected(i1) ) { if( i2 == nSelectedChildIndex ) @@ -218,9 +218,9 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibl return uno::Reference<XAccessible>(); } -void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int32 ) +void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int64 ) { - SAL_WARN("sw.a11y", "<SwAccessibleTextFrame::selectAllAccessibleChildren( sal_Int32 )> - missing implementation"); + SAL_WARN("sw.a11y", "SwAccessibleTextFrame::selectAllAccessibleChildren - missing implementation"); } // #i73249# diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index 050970f62aea..50a58729f8b0 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -48,22 +48,22 @@ public: virtual void SAL_CALL release() noexcept override; // 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; // XAccessibleContext diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx index 54c30f518440..f489bc140b6b 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.cxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx @@ -68,11 +68,11 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent return xAccParent; } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override { std::scoped_lock aGuard(maMutex); - sal_Int32 nIndex( -1 ); + sal_Int64 nIndex( -1 ); if ( mpAnchorFrame && GetWindow() && mrViewShell.GetAccessibleMap() ) diff --git a/test/source/a11y/AccessibilityTools.cxx b/test/source/a11y/AccessibilityTools.cxx index 991089dcb3e0..7a89ac2ac80f 100644 --- a/test/source/a11y/AccessibilityTools.cxx +++ b/test/source/a11y/AccessibilityTools.cxx @@ -43,9 +43,9 @@ AccessibilityTools::getAccessibleObjectForPredicate( } else { - int count = xCtx->getAccessibleChildCount(); + sal_Int64 count = xCtx->getAccessibleChildCount(); - for (int i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) + for (sal_Int64 i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) { uno::Reference<accessibility::XAccessibleContext> xCtx2 = getAccessibleObjectForPredicate(xCtx->getAccessibleChild(i), cPredicate); diff --git a/test/source/a11y/accessibletestbase.cxx b/test/source/a11y/accessibletestbase.cxx index 3968c32fa08d..64151644348c 100644 --- a/test/source/a11y/accessibletestbase.cxx +++ b/test/source/a11y/accessibletestbase.cxx @@ -134,7 +134,7 @@ test::AccessibleTestBase::getAllChildren( std::deque<uno::Reference<accessibility::XAccessibleContext>> children; auto childCount = xContext->getAccessibleChildCount(); - for (sal_Int32 i = 0; i < childCount && i < AccessibilityTools::MAX_CHILDREN; i++) + for (sal_Int64 i = 0; i < childCount && i < AccessibilityTools::MAX_CHILDREN; i++) { auto child = xContext->getAccessibleChild(i); children.push_back(child->getAccessibleContext()); @@ -227,7 +227,7 @@ uno::Reference<accessibility::XAccessibleContext> test::AccessibleTestBase::getI std::cout << "looking up item " << OUString(name) << " in " << AccessibilityTools::debugString(xMenuCtx) << std::endl; - for (sal_Int32 i = 0; i < childCount && i < AccessibilityTools::MAX_CHILDREN; i++) + for (sal_Int64 i = 0; i < childCount && i < AccessibilityTools::MAX_CHILDREN; i++) { auto item = xMenuCtx->getAccessibleChild(i)->getAccessibleContext(); if (accessibleNameMatches(item, name)) diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index ebe928218535..20065b86f101 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -68,8 +68,8 @@ namespace toolkit private: // 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_Int16 SAL_CALL getAccessibleRole( ) override; virtual OUString SAL_CALL getAccessibleDescription( ) override; diff --git a/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java index a3fac8c3dec0..d2c9b0f68a43 100644 --- a/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java +++ b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java @@ -250,10 +250,10 @@ public class AccessibleStatusBarItem { } public void runAllInterfaceTests() { - int count = testObject.getAccessibleChildCount(); + long count = testObject.getAccessibleChildCount(); System.out.println("*****"); System.out.println("**** Found items to test: " + count); - for (int i=0;i<count;i++){ + for (long i = 0; i < count; i++) { System.out.println("**** Now testing StatusBarItem " + i + "."); XAccessible object = null; try { diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java index 3d4df2c5ff19..e55cb1a22a1a 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java @@ -219,8 +219,8 @@ public class _XAccessibleComponent { + (chBnd.X ) + "," + chBnd.Y + ") - OK"); boolean res = util.AccessibilityTools.equals(xAccCh, xAcc); if (!res) { - int expIndex = xAccCh.getAccessibleContext().getAccessibleIndexInParent(); - int gotIndex = xAcc.getAccessibleContext().getAccessibleIndexInParent(); + long expIndex = xAccCh.getAccessibleContext().getAccessibleIndexInParent(); + long gotIndex = xAcc.getAccessibleContext().getAccessibleIndexInParent(); if (expIndex < gotIndex) { System.out.println("The children found is not the same"); System.out.println("The expected child " + @@ -387,7 +387,7 @@ public class _XAccessibleComponent { return new XAccessibleComponent[0]; } XAccessibleContext xAccCon = xAcc.getAccessibleContext(); - int cnt = xAccCon.getAccessibleChildCount(); + long cnt = xAccCon.getAccessibleChildCount(); // for cases when too many children exist checking only first 50 if (cnt > 50) @@ -396,7 +396,7 @@ public class _XAccessibleComponent { } ArrayList<XAccessibleComponent> childComp = new ArrayList<XAccessibleComponent>(); - for (int i = 0; i < cnt; i++) { + for (long i = 0; i < cnt; i++) { try { XAccessible child = xAccCon.getAccessibleChild(i); XAccessibleContext xAccConCh = child.getAccessibleContext(); diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java index e52855efa01a..645b3b03b9ef 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java @@ -49,7 +49,7 @@ public class _XAccessibleContext { private final XAccessibleContext oObj; - private int childCount = 0; + private long childCount = 0; private XAccessible parent = null ; public _XAccessibleContext(XInterface object) { @@ -80,12 +80,12 @@ public class _XAccessibleContext { */ public boolean _getAccessibleChild() { boolean bOK = true; - int counter = childCount; + long counter = childCount; if (childCount > 500) { counter = 500; } - for (int i = 0; i < counter; i++) { + for (long i = 0; i < counter; i++) { try { XAccessible ch = oObj.getAccessibleChild(i) ; XAccessibleContext chAC = ch.getAccessibleContext(); @@ -151,7 +151,7 @@ public class _XAccessibleContext { public boolean _getAccessibleIndexInParent() { boolean bOK = true; - int idx = oObj.getAccessibleIndexInParent(); + long idx = oObj.getAccessibleIndexInParent(); XAccessibleContext parentAC = parent.getAccessibleContext() ; try { diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx index 4e9ed7a1ee00..fa5fb9f7054f 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx @@ -138,9 +138,9 @@ void XAccessibleComponentTester::testContainsPoint() */ void XAccessibleComponentTester::testAccessibleAtPoint() { - int count = mxContext->getAccessibleChildCount(); + sal_Int64 count = mxContext->getAccessibleChildCount(); std::cout << "Found " << count << " children" << std::endl; - for (int i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) + for (sal_Int64 i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) { auto child = mxContext->getAccessibleChild(i); uno::Reference<accessibility::XAccessibleContext> childContext( diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx index e9b605c73956..9d7fdb992eae 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx @@ -33,8 +33,8 @@ */ void XAccessibleContextTester::testGetAccessibleChild() { - int count = mxContext->getAccessibleChildCount(); - for (int i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) + sal_Int64 count = mxContext->getAccessibleChildCount(); + for (sal_Int64 i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) { auto child = mxContext->getAccessibleChild(i); auto childCtx = child->getAccessibleContext(); @@ -55,9 +55,9 @@ void XAccessibleContextTester::testGetAccessibleChild() */ void XAccessibleContextTester::testGetAccessibleChildCount() { - auto childCount = mxContext->getAccessibleChildCount(); + sal_Int64 childCount = mxContext->getAccessibleChildCount(); std::cout << childCount << " children found." << std::endl; - CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int32>(0), childCount); + CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int64>(0), childCount); } /** @@ -80,7 +80,7 @@ void XAccessibleContextTester::testGetAccessibleDescription() */ void XAccessibleContextTester::testGetAccessibleIndexInParent() { - int idx = mxContext->getAccessibleIndexInParent(); + sal_Int64 idx = mxContext->getAccessibleIndexInParent(); std::cout << "The index in parent is " << idx << std::endl; auto parent = mxContext->getAccessibleParent(); diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index b45b1084e7d8..b7c44f53bd68 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -491,18 +491,18 @@ TRANSIENT // accessibility::XAccessibleContext -sal_Int32 VCLXAccessibleComponent::getAccessibleChildCount() +sal_Int64 VCLXAccessibleComponent::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); - sal_Int32 nChildren = 0; + sal_Int64 nChildren = 0; if ( GetWindow() ) nChildren = GetWindow()->GetAccessibleChildWindowCount(); return nChildren; } -uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int32 i ) +uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -542,11 +542,11 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi return xAcc; } -sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessibleComponent::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndex = -1; + sal_Int64 nIndex = -1; if ( GetWindow() ) { @@ -561,8 +561,8 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) uno::Reference< accessibility::XAccessibleContext > xParentContext ( xParentAcc->getAccessibleContext() ); if ( xParentContext.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for ( sal_Int32 i=0; i<nChildCount; i++ ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for ( sal_Int64 i = 0; i < nChildCount; i++ ) { uno::Reference< accessibility::XAccessible > xChild( xParentContext->getAccessibleChild(i) ); if ( xChild.is() ) @@ -664,7 +664,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi OExternalLockGuard aGuard( this ); uno::Reference< accessibility::XAccessible > xChild; - for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { uno::Reference< accessibility::XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 07b9e8e98018..fa6d43f0b374 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -126,14 +126,14 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) + sal_Int64 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) { // we do not have children return 0; } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int64 ) { // we do not have children throw IndexOutOfBoundsException(); diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java index c251f679064c..716e1374ef4a 100644 --- a/toolkit/test/accessibility/AccessibleCellHandler.java +++ b/toolkit/test/accessibility/AccessibleCellHandler.java @@ -77,7 +77,7 @@ class AccessibleCellHandler extends NodeHandler { case 0: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); aChild = new StringNode ("# table row: " + nRow, aParent); @@ -85,7 +85,7 @@ class AccessibleCellHandler extends NodeHandler break; case 1: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nCol = xTable.getAccessibleColumn( nChild ); aChild = new StringNode ("# table column: " + nCol, aParent); @@ -93,7 +93,7 @@ class AccessibleCellHandler extends NodeHandler break; case 2: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); int nCol = xTable.getAccessibleColumn( nChild ); int nExt = xTable.getAccessibleRowExtentAt( nRow, nCol ); @@ -103,7 +103,7 @@ class AccessibleCellHandler extends NodeHandler break; case 3: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); int nCol = xTable.getAccessibleColumn( nChild ); int nExt = xTable.getAccessibleColumnExtentAt( nRow, nCol ); @@ -113,7 +113,7 @@ class AccessibleCellHandler extends NodeHandler break; case 4: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); int nCol = xTable.getAccessibleColumn( nChild ); XAccessible xChild = @@ -135,7 +135,7 @@ class AccessibleCellHandler extends NodeHandler break; case 6: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); boolean bSelected = xTable.isAccessibleRowSelected( nRow ); @@ -145,7 +145,7 @@ class AccessibleCellHandler extends NodeHandler break; case 7: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nCol = xTable.getAccessibleColumn( nChild ); boolean bSelected = xTable.isAccessibleColumnSelected( nCol ); diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java index 4a8cd24ba9c9..41eae0d980fa 100644 --- a/toolkit/test/accessibility/AccessibleSelectionHandler.java +++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java @@ -72,12 +72,12 @@ class AccessibleSelectionHandler { VectorNode aVNode = new VectorNode( "Selected Children", aParent); - int nSelected = 0; - int nCount = ((AccTreeNode)aParent).getContext(). + long nSelected = 0; + long nCount = ((AccTreeNode)aParent).getContext(). getAccessibleChildCount(); try { - for( int i = 0; i < nCount; i++ ) + for( long i = 0; i < nCount; i++ ) { try { diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java index e022dbae8d6b..09fe7902517c 100644 --- a/toolkit/test/accessibility/AccessibleTreeHandler.java +++ b/toolkit/test/accessibility/AccessibleTreeHandler.java @@ -101,7 +101,7 @@ class AccessibleTreeHandler XAccessibleContext xContext = xChild.getAccessibleContext(); if (xContext != null) { - int nIndex = xContext.getAccessibleIndexInParent() + 1; + long nIndex = xContext.getAccessibleIndexInParent() + 1; synchronized (maChildList) { if ((nIndex >= 0) || (nIndex <= maChildList.size())) diff --git a/vcl/osx/a11yselectionwrapper.mm b/vcl/osx/a11yselectionwrapper.mm index 163fe27da32c..dfddce4b3b79 100644 --- a/vcl/osx/a11yselectionwrapper.mm +++ b/vcl/osx/a11yselectionwrapper.mm @@ -35,8 +35,8 @@ using namespace ::com::sun::star::uno; { NSMutableArray * children = [ [ NSMutableArray alloc ] init ]; try { - sal_Int32 n = xAccessibleSelection -> getSelectedAccessibleChildCount(); - for ( sal_Int32 i=0 ; i < n ; ++i ) { + sal_Int64 n = xAccessibleSelection -> getSelectedAccessibleChildCount(); + for ( sal_Int64 i=0 ; i < n ; ++i ) { [ children addObject: [ AquaA11yFactory wrapperForAccessible: xAccessibleSelection -> getSelectedAccessibleChild( i ) ] ]; } diff --git a/vcl/osx/a11ytablewrapper.mm b/vcl/osx/a11ytablewrapper.mm index e7cd02fcee7e..0cd98c7863dd 100644 --- a/vcl/osx/a11ytablewrapper.mm +++ b/vcl/osx/a11ytablewrapper.mm @@ -71,8 +71,8 @@ using namespace ::com::sun::star::uno; Reference < XAccessible > rAccessibleBottomRight = accessibleComponent -> getAccessibleAtPoint ( point ); if ( rAccessibleTopLeft.is() && rAccessibleBottomRight.is() ) { - sal_Int32 idxTopLeft = rAccessibleTopLeft -> getAccessibleContext() -> getAccessibleIndexInParent(); - sal_Int32 idxBottomRight = rAccessibleBottomRight -> getAccessibleContext() -> getAccessibleIndexInParent(); + sal_Int64 idxTopLeft = rAccessibleTopLeft -> getAccessibleContext() -> getAccessibleIndexInParent(); + sal_Int64 idxBottomRight = rAccessibleBottomRight -> getAccessibleContext() -> getAccessibleIndexInParent(); sal_Int32 rowTopLeft = accessibleTable -> getAccessibleRow ( idxTopLeft ); sal_Int32 columnTopLeft = accessibleTable -> getAccessibleColumn ( idxTopLeft ); sal_Int32 rowBottomRight = accessibleTable -> getAccessibleRow ( idxBottomRight ); diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm index f0f713876f9f..beb40f8851b3 100644 --- a/vcl/osx/a11ywrapper.mm +++ b/vcl/osx/a11ywrapper.mm @@ -342,8 +342,8 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { NSMutableArray * children = [ [ NSMutableArray alloc ] init ]; Reference< XAccessibleContext > xContext( [ self accessibleContext ] ); - sal_Int32 cnt = xContext -> getAccessibleChildCount(); - for ( sal_Int32 i = 0; i < cnt; i++ ) { + sal_Int64 cnt = xContext -> getAccessibleChildCount(); + for ( sal_Int64 i = 0; i < cnt; i++ ) { Reference< XAccessible > xChild( xContext -> getAccessibleChild( i ) ); if( xChild.is() ) { Reference< XAccessibleContext > xChildContext( xChild -> getAccessibleContext() ); @@ -744,7 +744,7 @@ static std::ostream &operator<<(std::ostream &s, NSObject *obj) { NSString * nativeSubrole = nil; NSString * title = nil; NSMutableArray * attributeNames = nil; - sal_Int32 nAccessibleChildren = 0; + sal_Int64 nAccessibleChildren = 0; try { // Default Attributes attributeNames = [ NSMutableArray arrayWithObjects: @@ -1000,7 +1000,7 @@ static Reference < XAccessibleContext > hitTestRunner ( css::awt::Point point, // apparently necessary as a special treatment for e.g. comboboxes if ( !hitChild.is() ) { bool bSafeToIterate = true; - sal_Int32 nCount = rxAccessibleContext -> getAccessibleChildCount(); + sal_Int64 nCount = rxAccessibleContext -> getAccessibleChildCount(); if (nCount < 0 || nCount > SAL_MAX_UINT16 /* slow enough for anyone */) bSafeToIterate = false; @@ -1011,7 +1011,7 @@ static Reference < XAccessibleContext > hitTestRunner ( css::awt::Point point, } if( bSafeToIterate ) { - for ( int i = 0; i < rxAccessibleContext -> getAccessibleChildCount(); i++ ) { + for ( sal_Int64 i = 0; i < rxAccessibleContext -> getAccessibleChildCount(); i++ ) { Reference < XAccessible > rxAccessibleChild = rxAccessibleContext -> getAccessibleChild ( i ); if ( rxAccessibleChild.is() && rxAccessibleChild -> getAccessibleContext().is() && rxAccessibleChild -> getAccessibleContext() -> getAccessibleRole() != AccessibleRole::LIST ) { Reference < XAccessibleContext > myHitChild = hitTestRunner ( point, rxAccessibleChild -> getAccessibleContext() ); diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx index de4e4f4b4f62..5f39e7cbfdc0 100644 --- a/vcl/osx/documentfocuslistener.cxx +++ b/vcl/osx/documentfocuslistener.cxx @@ -153,7 +153,7 @@ void DocumentFocusListener::attachRecursive( if( ! (nStateSet & AccessibleStateType::MANAGES_DESCENDANTS) ) { - sal_Int32 n, nmax = xContext->getAccessibleChildCount(); + sal_Int64 n, nmax = xContext->getAccessibleChildCount(); for( n = 0; n < nmax; n++ ) { Reference< XAccessible > xChild( xContext->getAccessibleChild( n ) ); @@ -197,7 +197,7 @@ void DocumentFocusListener::detachRecursive( if( ! (nStateSet & AccessibleStateType::MANAGES_DESCENDANTS) ) { - sal_Int32 n, nmax = xContext->getAccessibleChildCount(); + sal_Int64 n, nmax = xContext->getAccessibleChildCount(); for( n = 0; n < nmax; n++ ) { Reference< XAccessible > xChild( xContext->getAccessibleChild( n ) ); diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx index 60d64fa98731..c097d8efd6ac 100644 --- a/vcl/qt5/QtAccessibleWidget.cxx +++ b/vcl/qt5/QtAccessibleWidget.cxx @@ -149,7 +149,15 @@ int QtAccessibleWidget::childCount() const if (!xAc.is()) return 0; - return xAc->getAccessibleChildCount(); + sal_Int64 nChildCount = xAc->getAccessibleChildCount(); + if (nChildCount > std::numeric_limits<int>::max()) + { + SAL_WARN("vcl.qt", "QtAccessibleWidget::childCount: Child count exceeds maximum int value, " + "returning max int."); + nChildCount = std::numeric_limits<int>::max(); + } + + return nChildCount; } int QtAccessibleWidget::indexOfChild(const QAccessibleInterface* pChild) const @@ -167,7 +175,18 @@ int QtAccessibleWidget::indexOfChild(const QAccessibleInterface* pChild) const if (!xContext.is()) return -1; - return xContext->getAccessibleIndexInParent(); + sal_Int64 nChildIndex = xContext->getAccessibleIndexInParent(); + if (nChildIndex > std::numeric_limits<int>::max()) + { + // use -2 when the child index is too large to fit into 32 bit to neither use the + // valid index of another child nor -1, which would e.g. make the Orca screen reader + // interpret the object as being a zombie + SAL_WARN("vcl.qt", + "QtAccessibleWidget::indexOfChild: Child index exceeds maximum int value, " + "returning -2."); + nChildIndex = -2; + } + return nChildIndex; } namespace @@ -1634,7 +1653,15 @@ int QtAccessibleWidget::selectedCellCount() const if (!xSelection.is()) return 0; - return xSelection->getSelectedAccessibleChildCount(); + sal_Int64 nSelected = xSelection->getSelectedAccessibleChildCount(); + if (nSelected > std::numeric_limits<int>::max()) + { + SAL_WARN("vcl.qt", + "QtAccessibleWidget::selectedCellCount: Cell count exceeds maximum int value, " + "using max int."); + nSelected = std::numeric_limits<int>::max(); + } + return nSelected; } QList<QAccessibleInterface*> QtAccessibleWidget::selectedCells() const @@ -1648,8 +1675,15 @@ QList<QAccessibleInterface*> QtAccessibleWidget::selectedCells() const return QList<QAccessibleInterface*>(); QList<QAccessibleInterface*> aSelectedCells; - const sal_Int32 nSelected = xSelection->getSelectedAccessibleChildCount(); - for (int i = 0; i < nSelected; i++) + sal_Int64 nSelected = xSelection->getSelectedAccessibleChildCount(); + if (nSelected > std::numeric_limits<int>::max()) + { + SAL_WARN("vcl.qt", + "QtAccessibleWidget::selectedCells: Cell count exceeds maximum int value, " + "using max int."); + nSelected = std::numeric_limits<int>::max(); + } + for (sal_Int64 i = 0; i < nSelected; i++) { Reference<XAccessible> xChild = xSelection->getSelectedAccessibleChild(i); QAccessibleInterface* pInterface @@ -1777,7 +1811,7 @@ int QtAccessibleWidget::columnIndex() const if (!xTable.is()) return -1; - const sal_Int32 nIndexInParent = xAcc->getAccessibleIndexInParent(); + const sal_Int64 nIndexInParent = xAcc->getAccessibleIndexInParent(); return xTable->getAccessibleColumn(nIndexInParent); } @@ -1858,7 +1892,7 @@ int QtAccessibleWidget::rowIndex() const if (!xTable.is()) return -1; - const sal_Int32 nIndexInParent = xAcc->getAccessibleIndexInParent(); + const sal_Int64 nIndexInParent = xAcc->getAccessibleIndexInParent(); return xTable->getAccessibleRow(nIndexInParent); } diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 89adf9b8ea9e..6d8d356ceb7a 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -584,13 +584,13 @@ FindFocusedEditableText(uno::Reference<accessibility::XAccessibleContext> const& } bool bSafeToIterate = true; - sal_Int32 nCount = xContext->getAccessibleChildCount(); + sal_Int64 nCount = xContext->getAccessibleChildCount(); if (nCount < 0 || nCount > SAL_MAX_UINT16 /* slow enough for anyone */) bSafeToIterate = false; if (!bSafeToIterate) return uno::Reference<accessibility::XAccessibleEditableText>(); - for (sal_Int32 i = 0; i < xContext->getAccessibleChildCount(); ++i) + for (sal_Int64 i = 0; i < xContext->getAccessibleChildCount(); ++i) { uno::Reference<accessibility::XAccessible> xChild = xContext->getAccessibleChild(i); if (!xChild.is()) diff --git a/vcl/unx/gtk3/a11y/atklistener.cxx b/vcl/unx/gtk3/a11y/atklistener.cxx index 600bb2273881..98cbfab3a2cd 100644 --- a/vcl/unx/gtk3/a11y/atklistener.cxx +++ b/vcl/unx/gtk3/a11y/atklistener.cxx @@ -145,9 +145,10 @@ void AtkListener::updateChildList( } else { - sal_Int32 nChildren = pContext->getAccessibleChildCount(); + sal_Int64 nChildren = pContext->getAccessibleChildCount(); + assert(o3tl::make_unsigned(nChildren) < m_aChildList.max_size()); m_aChildList.resize(nChildren); - for(sal_Int32 n = 0; n < nChildren; n++) + for(sal_Int64 n = 0; n < nChildren; n++) { try { @@ -155,7 +156,7 @@ void AtkListener::updateChildList( } catch (lang::IndexOutOfBoundsException const&) { - sal_Int32 nChildren2 = pContext->getAccessibleChildCount(); + sal_Int64 nChildren2 = pContext->getAccessibleChildCount(); assert(nChildren2 <= n && "consistency?"); m_aChildList.resize(std::min(nChildren2, n)); break; diff --git a/vcl/unx/gtk3/a11y/atkselection.cxx b/vcl/unx/gtk3/a11y/atkselection.cxx index 6b64c25f4fee..0e74f1c295f4 100644 --- a/vcl/unx/gtk3/a11y/atkselection.cxx +++ b/vcl/unx/gtk3/a11y/atkselection.cxx @@ -20,6 +20,7 @@ #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleSelection.hpp> +#include <sal/log.hxx> using namespace ::com::sun::star; @@ -106,7 +107,16 @@ selection_get_selection_count( AtkSelection *selection) css::uno::Reference<css::accessibility::XAccessibleSelection> pSelection = getSelection( selection ); if( pSelection.is() ) - return pSelection->getSelectedAccessibleChildCount(); + { + sal_Int64 nSelected = pSelection->getSelectedAccessibleChildCount(); + if (nSelected > std::numeric_limits<gint>::max()) + { + SAL_WARN("vcl.gtk", "selection_get_selection_count: Count exceeds maximum gint value, " + "using max gint."); + nSelected = std::numeric_limits<gint>::max(); + } + return nSelected; + } } catch(const uno::Exception&) { g_warning( "Exception in getSelectedAccessibleChildCount()" ); @@ -146,7 +156,7 @@ selection_remove_selection( AtkSelection *selection, return false; css::uno::Reference<css::accessibility::XAccessibleContext> xAccContext = xAcc->getAccessibleContext(); - const sal_Int32 nChildIndex = xAccContext->getAccessibleIndexInParent(); + const sal_Int64 nChildIndex = xAccContext->getAccessibleIndexInParent(); pSelection->deselectAccessibleChild(nChildIndex); return true; } diff --git a/vcl/unx/gtk3/a11y/atktable.cxx b/vcl/unx/gtk3/a11y/atktable.cxx index 04e9d7645cc5..021f3c19c42c 100644 --- a/vcl/unx/gtk3/a11y/atktable.cxx +++ b/vcl/unx/gtk3/a11y/atktable.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/accessibility/XAccessibleTable.hpp> #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp> #include <comphelper/sequence.hxx> +#include <sal/log.hxx> using namespace ::com::sun::star; @@ -122,7 +123,19 @@ table_wrapper_get_index_at (AtkTable *table, css::uno::Reference<css::accessibility::XAccessibleTable> pTable = getTable( table ); if( pTable.is() ) - return pTable->getAccessibleIndex( row, column ); + { + sal_Int64 nIndex = pTable->getAccessibleIndex( row, column ); + if (nIndex > std::numeric_limits<gint>::max()) + { + // use -2 when the child index is too large to fit into 32 bit to neither use the + // valid index of another cell nor -1, which might easily be interpreted as the cell + // not/no longer being valid + SAL_WARN("vcl.gtk", "table_wrapper_get_index_at: Child index exceeds maximum gint value, " + "returning -2."); + nIndex = -2; + } + return nIndex; + } } catch(const uno::Exception&) { g_warning( "Exception in getAccessibleIndex()" ); diff --git a/vcl/unx/gtk3/a11y/atkutil.cxx b/vcl/unx/gtk3/a11y/atkutil.cxx index ed93b842a9c8..d57818f2d40f 100644 --- a/vcl/unx/gtk3/a11y/atkutil.cxx +++ b/vcl/unx/gtk3/a11y/atkutil.cxx @@ -257,7 +257,7 @@ void DocumentFocusListener::attachRecursive( if( ! (nStateSet & accessibility::AccessibleStateType::MANAGES_DESCENDANTS) ) { - sal_Int32 n, nmax = xContext->getAccessibleChildCount(); + sal_Int64 n, nmax = xContext->getAccessibleChildCount(); for( n = 0; n < nmax; n++ ) { uno::Reference< accessibility::XAccessible > xChild( xContext->getAccessibleChild( n ) ); @@ -308,7 +308,7 @@ void DocumentFocusListener::detachRecursive( if( ! (nStateSet & accessibility::AccessibleStateType::MANAGES_DESCENDANTS) ) { - sal_Int32 n, nmax = xContext->getAccessibleChildCount(); + sal_Int64 n, nmax = xContext->getAccessibleChildCount(); for( n = 0; n < nmax; n++ ) { uno::Reference< accessibility::XAccessible > xChild( xContext->getAccessibleChild( n ) ); @@ -363,7 +363,6 @@ static void notify_toolbox_item_focus(ToolBox *pToolBox) ToolBox::ImplToolItems::size_type nPos = pToolBox->GetItemPos( pToolBox->GetHighlightItemId() ); if( nPos != ToolBox::ITEM_NOTFOUND ) atk_wrapper_focus_tracker_notify_when_idle( xContext->getAccessibleChild( nPos ) ); - //TODO: ToolBox::ImplToolItems::size_type -> sal_Int32 } static void handle_toolbox_highlight(vcl::Window *pWindow) diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx index c99290fd4a9a..e2aa2c210dd5 100644 --- a/vcl/unx/gtk3/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx @@ -449,7 +449,14 @@ wrapper_get_n_children( AtkObject *atk_obj ) if( obj->mpContext.is() ) { try { - n = obj->mpContext->getAccessibleChildCount(); + sal_Int64 nChildCount = obj->mpContext->getAccessibleChildCount(); + if (nChildCount > std::numeric_limits<gint>::max()) + { + SAL_WARN("vcl.gtk", "wrapper_get_n_children: Child count exceeds maximum gint value, " + "returning max gint."); + nChildCount = std::numeric_limits<gint>::max(); + } + n = nChildCount; } catch(const uno::Exception&) { TOOLS_WARN_EXCEPTION( "vcl", "Exception" ); @@ -514,7 +521,17 @@ wrapper_get_index_in_parent( AtkObject *atk_obj ) if( obj->mpContext.is() ) { try { - i = obj->mpContext->getAccessibleIndexInParent(); + sal_Int64 nIndex = obj->mpContext->getAccessibleIndexInParent(); + if (nIndex > std::numeric_limits<gint>::max()) + { + // use -2 when the child index is too large to fit into 32 bit to neither use the + // valid index of another child nor -1, which would e.g. make Orca interpret the + // object as being a zombie + SAL_WARN("vcl.gtk", "wrapper_get_index_in_parent: Child index exceeds maximum gint value, " + "returning -2."); + nIndex = -2; + } + i = nIndex; } catch(const uno::Exception&) { g_warning( "Exception in getAccessibleIndexInParent()" ); diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index 63f9edf7ec14..16eea5bb533d 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -32,6 +32,7 @@ #pragma clang diagnostic pop #endif +#include <sal/log.hxx> #include <vcl/svapp.hxx> #include <o3tl/char16_t2wchar_t.hxx> @@ -684,8 +685,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectRow(long row) lColumnCount = pRXTable->getAccessibleColumnCount(); for(lCol = 0; lCol < lColumnCount; lCol ++) { - long lChildIndex = pRXTable->getAccessibleIndex(row, lCol); - pRSelection->selectAccessibleChild(lChildIndex); + sal_Int64 nChildIndex = pRXTable->getAccessibleIndex(row, lCol); + pRSelection->selectAccessibleChild(nChildIndex); } return S_OK; @@ -728,8 +729,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::selectColumn(long column) lRowCount = pRXTable->getAccessibleRowCount(); for(lRow = 0; lRow < lRowCount; lRow ++) { - long lChildIndex = pRXTable->getAccessibleIndex(lRow, column); - pRSelection->selectAccessibleChild(lChildIndex); + sal_Int64 nChildIndex = pRXTable->getAccessibleIndex(lRow, column); + pRSelection->selectAccessibleChild(nChildIndex); } return S_OK; @@ -775,8 +776,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectRow(long row) lColumnCount = pRXTable->getAccessibleColumnCount(); for(lColumn = 0; lColumn < lColumnCount; lColumn ++) { - long lChildIndex = pRXTable->getAccessibleIndex(row, lColumn); - pRSelection->deselectAccessibleChild(lChildIndex); + sal_Int64 nChildIndex = pRXTable->getAccessibleIndex(row, lColumn); + pRSelection->deselectAccessibleChild(nChildIndex); } return S_OK; @@ -823,8 +824,8 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::unselectColumn(long column) for(lRow = 0; lRow < lRowCount; lRow ++) { - long lChildIndex = pRXTable->getAccessibleIndex(lRow, column); - pRSelection->deselectAccessibleChild(lChildIndex); + sal_Int64 nChildIndex = pRXTable->getAccessibleIndex(lRow, column); + pRSelection->deselectAccessibleChild(nChildIndex); } return S_OK; } @@ -931,7 +932,17 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_childIndex(long RowIndex , long if(!pRXTable.is()) return E_FAIL; - *childIndex = pRXTable->getAccessibleIndex(RowIndex, columnIndex); + sal_Int64 nIndex = pRXTable->getAccessibleIndex(RowIndex, columnIndex); + if (nIndex > std::numeric_limits<long>::max()) + { + // use -2 when the child index is too large to fit into 32 bit to neither use the + // valid index of another child nor -1, which is more commonly used to indicate that + // a child is no more inside of a parent or invalid otherwise + SAL_WARN("vcl.qt", "CAccTable::get_childIndex: Child index exceeds maximum long value, " + "returning -2."); + nIndex = -2; + } + *childIndex = nIndex; return S_OK; } catch(...) { return E_FAIL; } @@ -973,7 +984,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nSelectedChildren(long *childCo if(!pRSelection.is()) return E_FAIL; - *childCount = pRSelection->getSelectedAccessibleChildCount(); + sal_Int64 nSelected = pRSelection->getSelectedAccessibleChildCount(); + if (nSelected > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CAccTable::get_nSelectedChildren: Selected item count exceeds maximum long value, " + "using max long."); + nSelected = std::numeric_limits<long>::max(); + } + *childCount = nSelected; return S_OK; } catch(...) { return E_FAIL; } @@ -1011,13 +1029,18 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedChildren(long, long **c if(!pRSelection.is()) return E_FAIL; - long childCount = pRSelection->getSelectedAccessibleChildCount() ; - - *nChildren = childCount; + sal_Int64 nChildCount = pRSelection->getSelectedAccessibleChildCount(); + if (nChildCount > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CAccTable::get_selectedChildren: Selected child count exceeds maximum long value, " + "using max long."); + nChildCount = std::numeric_limits<long>::max(); + } - *children = static_cast<long*>(CoTaskMemAlloc(childCount * sizeof(long))); + *nChildren = nChildCount; + *children = static_cast<long*>(CoTaskMemAlloc(nChildCount * sizeof(long))); - for( long i = 0; i< childCount; i++) + for( long i = 0; i< nChildCount; i++) { Reference<XAccessible> pRAcc = pRSelection->getSelectedAccessibleChild(i); if(pRAcc.is()) @@ -1026,8 +1049,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedChildren(long, long **c if( !pRContext.is() ) return E_FAIL; - long childIndex = pRContext->getAccessibleIndexInParent(); - (*children)[i] = childIndex; + + sal_Int64 nChildIndex = pRContext->getAccessibleIndexInParent(); + if (nChildIndex > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CAccTable::get_selectedChildren: Child index exceeds maximum long value, " + "using max long."); + nChildIndex = std::numeric_limits<long>::max(); + } + (*children)[i] = nChildIndex; } } @@ -1061,7 +1091,13 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_selectedCells(IUnknown * * * ce if (!xSelection.is()) return E_FAIL; - const long nSelected = xSelection->getSelectedAccessibleChildCount(); + sal_Int64 nSelected = xSelection->getSelectedAccessibleChildCount(); + if (nSelected > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CAccTable::get_selectedCells: Selected cell count exceeds maximum long value, " + "using max long."); + nSelected = std::numeric_limits<long>::max(); + } *nSelectedCells = nSelected; *cells = static_cast<IUnknown**>(CoTaskMemAlloc(nSelected * sizeof(IUnknown*))); diff --git a/winaccessibility/source/UAccCOM/AccTableCell.h b/winaccessibility/source/UAccCOM/AccTableCell.h index ee1649ea7115..95250d53ada3 100644 --- a/winaccessibility/source/UAccCOM/AccTableCell.h +++ b/winaccessibility/source/UAccCOM/AccTableCell.h @@ -81,7 +81,7 @@ public: private: css::uno::Reference<css::accessibility::XAccessibleTable> m_xTable; - sal_Int32 m_nIndexInParent; + sal_Int64 m_nIndexInParent; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index 92d4540796be..885a1ebc3cb8 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -30,6 +30,7 @@ #pragma clang diagnostic pop #endif +#include <sal/log.hxx> #include <vcl/svapp.hxx> using namespace com::sun::star::uno; @@ -50,7 +51,6 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * { SolarMutexGuard g; - long l1; ULONG l2; if (pvar == nullptr) @@ -59,9 +59,17 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * if (pcElementFetched != nullptr) *pcElementFetched = 0; + sal_Int64 nChildCount = m_pXAccessibleSelection->getSelectedAccessibleChildCount(); + if (nChildCount > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CEnumVariant::Next: Child count exceeds maximum long value, " + "using max long."); + nChildCount = std::numeric_limits<long>::max(); + } + // Retrieve the next cElements. - for (l1=m_lCurrent, l2=0; l1<m_pXAccessibleSelection->getSelectedAccessibleChildCount() && - l2<cElements; l1++, l2++) + sal_Int64 l1; + for (l1 = m_nCurrent, l2 = 0; l1 < nChildCount && l2 < cElements; l1++, l2++) { Reference< XAccessible > pRXAcc = m_pXAccessibleSelection->getSelectedAccessibleChild(l1); IAccessible* pChild = nullptr; @@ -90,7 +98,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * // Set count of elements retrieved. if (pcElementFetched != nullptr) *pcElementFetched = l2; - m_lCurrent = l1; + m_nCurrent = l1; return (l2 < cElements) ? S_FALSE : NOERROR; } @@ -104,10 +112,17 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Skip(ULONG cElements) { SolarMutexGuard g; - m_lCurrent += cElements; - if (m_lCurrent > m_pXAccessibleSelection->getSelectedAccessibleChildCount()) + m_nCurrent += cElements; + sal_Int64 nChildCount = m_pXAccessibleSelection->getSelectedAccessibleChildCount(); + if (nChildCount > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CEnumVariant::Skip: Child count exceeds maximum long value, " + "using max long."); + nChildCount = std::numeric_limits<long>::max(); + } + if (m_nCurrent > nChildCount) { - m_lCurrent = m_pXAccessibleSelection->getSelectedAccessibleChildCount(); + m_nCurrent = nChildCount; return E_FAIL; } else @@ -124,7 +139,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Reset() { SolarMutexGuard g; - m_lCurrent = 0; + m_nCurrent = 0; return NOERROR; } @@ -188,12 +203,21 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Create(CEnumVariant __RPC_FAR *__RPC_FAR long CEnumVariant::GetCountOfElements() { if(m_pXAccessibleSelection.is()) - return m_pXAccessibleSelection->getSelectedAccessibleChildCount(); + { + sal_Int64 nCount = m_pXAccessibleSelection->getSelectedAccessibleChildCount(); + if (nCount > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CEnumVariant::GetCountOfElements: Count exceeds maximum long value, " + "using max long."); + nCount = std::numeric_limits<long>::max(); + } + return nCount; + } return 0; } /** - * Set member m_pXAccessibleSelection to NULL and m_lCurrent to 0. + * Set member m_pXAccessibleSelection to NULL and m_nCurrent to 0. * @param. * @return Result */ @@ -203,7 +227,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CEnumVariant::ClearEnumeration() pUNOInterface = nullptr; m_pXAccessibleSelection = nullptr; - m_lCurrent = 0; + m_nCurrent = 0; return S_OK; } diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h index 6d5bd286dbaf..bf7a45feb155 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.h +++ b/winaccessibility/source/UAccCOM/EnumVariant.h @@ -43,7 +43,7 @@ class ATL_NO_VTABLE CEnumVariant : { public: CEnumVariant() - :m_lCurrent(0), + :m_nCurrent(0), pUNOInterface(nullptr) { } @@ -98,7 +98,7 @@ public: private: - long m_lCurrent; + sal_Int64 m_nCurrent; css::accessibility::XAccessible* pUNOInterface; css::uno::Reference<css::accessibility::XAccessibleSelection> m_pXAccessibleSelection; diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index a7b313ae0abf..2b11d2ed7d12 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -44,6 +44,7 @@ #include "AccHyperLink.h" #include <rtl/ustrbuf.hxx> +#include <sal/log.hxx> #include <vcl/svapp.hxx> #include <o3tl/char16_t2wchar_t.hxx> #include <comphelper/AccessibleImplementationHelper.hxx> @@ -293,7 +294,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_accChildCount(long *pcountCh m_xAccessible->getAccessibleContext(); if( pRContext.is() ) { - *pcountChildren = pRContext->getAccessibleChildCount(); + sal_Int64 nChildCount = pRContext->getAccessibleChildCount(); + if (nChildCount > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CMAccessible::get_accChildCount: Child count exceeds maximum long value, " + "returning max long."); + nChildCount = std::numeric_limits<long>::max(); + } + + *pcountChildren = nChildCount; } return S_OK; @@ -981,7 +990,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::accHitTest(long xLeft, long yTop accLocation(&x,&y,&w,&h,varSelf); if( (x < xLeft && (x + w) >xLeft) && (y < yTop && (y + h) >yTop) ) { - int i, nCount; + sal_Int64 i, nCount; pvarChild->vt = VT_EMPTY; Reference< XAccessibleContext > pRContext = GetContextByXAcc(m_xAccessible.get()); nCount = pRContext->getAccessibleChildCount(); @@ -1356,7 +1365,7 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT varCur, short flags) return nullptr; } - int count = pXContext->getAccessibleChildCount(); + sal_Int64 count = pXContext->getAccessibleChildCount(); if(count<1) { return nullptr; @@ -1369,7 +1378,7 @@ IMAccessible* CMAccessible::GetNavigateChildForDM(VARIANT varCur, short flags) }; Reference<XAccessible> pRChildXAcc; XAccessibleContext* pChildContext = nullptr; - int index = 0,delta=0; + sal_Int64 index = 0, delta = 0; switch(flags) { case DM_FIRSTCHILD: @@ -1870,7 +1879,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR Sequence< Reference< XInterface > > xTargets = accRelation.TargetSet; Reference<XInterface> pRAcc = xTargets[0]; - for(int j=0; j<pRParentContext->getAccessibleChildCount(); j++) + sal_Int64 nChildCount = pRParentContext->getAccessibleChildCount(); + assert(nChildCount < std::numeric_limits<long>::max()); + for (sal_Int64 j = 0; j< nChildCount; j++) { if( getTheParentOfMember(pRParentContext->getAccessibleChild(j).get()) == static_cast<XAccessible*>(pRAcc.get()) && @@ -1893,8 +1904,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR *similarItemsInGroup = 0; *positionInGroup = -1; - long nCount = pRContext->getAccessibleChildCount(); - if( 2 != nCount) + if (pRContext->getAccessibleChildCount() != 2) { return S_OK; } @@ -1913,7 +1923,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR { return S_OK; } - *similarItemsInGroup = xListContext->getAccessibleChildCount(); + sal_Int64 nChildCount = xListContext->getAccessibleChildCount(); + assert(nChildCount < std::numeric_limits<long>::max()); + *similarItemsInGroup = nChildCount; if (*similarItemsInGroup > 0 ) { try @@ -1937,8 +1949,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR else if ( PAGE_TAB == Role ) { *groupLevel = 1; - *similarItemsInGroup = pRParentContext->getAccessibleChildCount(); - + sal_Int64 nChildCount = pRParentContext->getAccessibleChildCount(); + assert(nChildCount < std::numeric_limits<long>::max()); + *similarItemsInGroup = nChildCount; if (*similarItemsInGroup > 0 ) { *positionInGroup=pRContext->getAccessibleIndexInParent() + 1 ; @@ -1967,7 +1980,9 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_groupPosition(long __RPC_FAR Reference< XAccessible> pTempAcc = pRContext->getAccessibleParent(); pRParentContext = pTempAcc->getAccessibleContext(); *groupLevel = level; - *similarItemsInGroup = pRParentContext->getAccessibleChildCount(); + sal_Int64 nChildCount = pRParentContext->getAccessibleChildCount(); + assert(nChildCount < std::numeric_limits<long>::max()); + *similarItemsInGroup = nChildCount; *positionInGroup = pRContext->getAccessibleIndexInParent() + 1; } else @@ -2091,8 +2106,7 @@ HRESULT CMAccessible::SelectChild(XAccessible* pItem) Reference< XAccessibleSelection > pRSelection = GetSelection(); if( !pRSelection.is() ) return E_FAIL; - long Index = pContext->getAccessibleIndexInParent(); - pRSelection->selectAccessibleChild( Index ); + pRSelection->selectAccessibleChild(pContext->getAccessibleIndexInParent()); return S_OK; } catch(...) { return E_FAIL; } @@ -2117,8 +2131,7 @@ HRESULT CMAccessible::DeSelectChild(XAccessible* pItem) Reference< XAccessibleSelection > pRSelection = GetSelection(); if( !pRSelection.is() ) return E_FAIL; - long Index = pContext->getAccessibleIndexInParent(); - pRSelection->deselectAccessibleChild( Index ); + pRSelection->deselectAccessibleChild(pContext->getAccessibleIndexInParent()); return S_OK; @@ -2278,7 +2291,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::accSelect(long flagsSelect, VARI if( flagsSelect & SELFLAG_EXTENDSELECTION ) { - long indexInParrent = pRContext->getAccessibleIndexInParent(); + sal_Int64 indexInParrent = pRContext->getAccessibleIndexInParent(); if( pRParentSelection->isAccessibleChildSelected( indexInParrent + 1 ) || pRParentSelection->isAccessibleChildSelected( indexInParrent - 1 ) ) @@ -2978,7 +2991,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::get_indexInParent(long __RPC_FAR if (!m_xContext.is()) return E_FAIL; - *accParentIndex = m_xContext->getAccessibleIndexInParent(); + sal_Int64 nIndex = m_xContext->getAccessibleIndexInParent(); + if (nIndex > std::numeric_limits<long>::max()) + { + SAL_WARN("iacc2", "CMAccessible::get_indexInParent: Child index exceeds maximum long value, " + "returning max long."); + nIndex = std::numeric_limits<long>::max(); + } + *accParentIndex = nIndex; return S_OK; diff --git a/winaccessibility/source/service/AccContainerEventListener.cxx b/winaccessibility/source/service/AccContainerEventListener.cxx index 2dd45d2fb616..da150f457bd8 100644 --- a/winaccessibility/source/service/AccContainerEventListener.cxx +++ b/winaccessibility/source/service/AccContainerEventListener.cxx @@ -487,8 +487,8 @@ void AccContainerEventListener::UpdateAllChildrenState(XAccessible* pXAccessible return; } - int count = pAccessibleContext->getAccessibleChildCount(); - for (int i=0;i<count;i++) + const sal_Int64 nCount = pAccessibleContext->getAccessibleChildCount(); + for (sal_Int64 i = 0; i < nCount; i++) { Reference<css::accessibility::XAccessible> mxAccessible = pAccessibleContext->getAccessibleChild(i); diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx index c404223fb73a..4967ecb4ee4e 100644 --- a/winaccessibility/source/service/AccObjectWinManager.cxx +++ b/winaccessibility/source/service/AccObjectWinManager.cxx @@ -516,8 +516,8 @@ bool AccObjectWinManager::InsertChildrenAccObj( css::accessibility::XAccessible* } } - int count = pRContext->getAccessibleChildCount(); - for (int i=0;i<count;i++) + const sal_Int64 nCount = pRContext->getAccessibleChildCount(); + for (sal_Int64 i = 0; i < nCount; i++) { Reference<XAccessible> mxAccessible = pRContext->getAccessibleChild(i); @@ -1023,8 +1023,8 @@ void AccObjectWinManager::UpdateChildState(css::accessibility::XAccessible* pAcc { return; } - sal_Int32 nCount = xContext->getAccessibleChildCount(); - for (sal_Int32 i = 0 ; i < nCount ; ++i) + const sal_Int64 nCount = xContext->getAccessibleChildCount(); + for (sal_Int64 i = 0 ; i < nCount; ++i) { Reference<css::accessibility::XAccessible> xChild = xContext->getAccessibleChild(i); if (xChild.is()) diff --git a/winaccessibility/source/service/AccTopWindowListener.cxx b/winaccessibility/source/service/AccTopWindowListener.cxx index a828c36c0413..a6b935d55798 100644 --- a/winaccessibility/source/service/AccTopWindowListener.cxx +++ b/winaccessibility/source/service/AccTopWindowListener.cxx @@ -158,9 +158,8 @@ void AccTopWindowListener::AddAllListeners(css::accessibility::XAccessible* pAcc } } - - int count = pAccessibleContext->getAccessibleChildCount(); - for (int i=0;i<count;i++) + sal_Int64 nCount = pAccessibleContext->getAccessibleChildCount(); + for (sal_Int64 i = 0; i < nCount; i++) { Reference<css::accessibility::XAccessible> mxAccessible = pAccessibleContext->getAccessibleChild(i); diff --git a/winaccessibility/source/service/msaaservice_impl.cxx b/winaccessibility/source/service/msaaservice_impl.cxx index 13f10a6d7d74..ed9f88062720 100644 --- a/winaccessibility/source/service/msaaservice_impl.cxx +++ b/winaccessibility/source/service/msaaservice_impl.cxx @@ -164,8 +164,8 @@ static void AccessBridgeHandleExistingWindow(const Reference< XMSAAService > &xA { // O.k. - this is a combo box floating window corresponding to the child of role LIST of the parent. // Let's not rely on a specific child order, just search for the child with the role LIST - sal_Int32 nCount = xParentAC->getAccessibleChildCount(); - for ( sal_Int32 n = 0; (n < nCount) && !xAccessible.is(); n++) + sal_Int64 nCount = xParentAC->getAccessibleChildCount(); + for (sal_Int64 n = 0; (n < nCount) && !xAccessible.is(); n++) { css::uno::Reference< css::accessibility::XAccessible > xChild = xParentAC->getAccessibleChild(n); if ( xChild.is() ) |