diff options
Diffstat (limited to 'accessibility')
92 files changed, 471 insertions, 455 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 ); |