ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

[API CHANGE] tdf#150683 a11y: Switch a11y child index to 64 bit

Browse Source 
With 16k column support in Calc enabled by default in

    commit 4c5f8ccf0a
    Date:   Tue Mar 8 12:44:49 2022 +0100

        change default Calc number of columns to 16384 (tdf#50916)

, the number of Calc cells in a spreadsheet is larger than
SAL_MAX_INT32, meaning that a 32-bit a11y child index is no more
enough and using it resulted in integer overflows in
methods handling corresponding Calc cells in the a11y layer.
This e.g. had the effect of the Orca and NVDA screen readers
not announcing focused or selected cells properly when their
a11y child index was out of the 32-bit integer range.

Switch the internal a11y child indices to 64 bit to
be able to handle this properly internally.

Since the platform APIs (at least AT-SPI on Linux and
IAccessible2 on Windows; from what I can see LO's macOS
a11y bridge doesn't directly expose the child index)
are still restricted to 32 bit, larger child indices
still cannot be exposed via the platform APIs.

As a consequence, use of the the IAccessible2 and
AT-SPI methods that use the child index remains
problematic in those cases where the child index
is larger. However, as an alternative to using the
AT-SPI Table interface and the IAccessibleTable/
IAccessibleTable2 interfaces with the child index
to retrieve information about a specific cell,
both AT-SPI and IAccessible2 also provide interfaces
to retrieve that information directly
from the cell object (TableCell interface for AT-SPI,
IAccessibleTableCell for IAccessible2).

Those interfaces are already implemented/exposed
for winaccessibility (s. `CAccTable`) and the
qt5/qt6/kf5 VCL plugins (s. the `QAccessibleTableCellInterface`
methods implemented in `QtAccessibleInterface`).
With the switch to 64-bit internal a11y child indices,
these now behave correctly for cells with a child
index that doesn't fit into 32 bit as well.

NVDA on Windows already uses the IAccessibleTableCell
interface and thus announcing focused cells works fine
with this change in place.

Orca on Linux currently doesn't make use of the AT-SPI
TableCell interface yet, but with a suggested change to
do so [1], announcement of selected cells works
with the qt6 VCL plugin with a current qtbase dev branch
as well - when combined with the suggested changes
to implement support for the AT-SPI TableCell interface
in Qt [2] [3] and the LO change based on that [4] and
a fix for a nullptr dereference [5].

The gtk3 VCL plugin doesn't expose the AT-SPI
TableCell interface yet, but once it does so
(via `AtkTableCell`), it also works with the
suggested Orca change [1] in place.
(Adding that is planned for an upcoming change,
works with a local WIP patch.)

For handling return values that are larger than what
platform APIs support, the following approach has
been chosen for now:

1) When the return value is for the count of
(selected) children, the maximum value N
supported by the platform API is returned.
(This is what `ScAccessibleTableBase::getAccessibleChildCount`
did previously.)
The first N elements can be accessed by their
actual (selection) indices.

2) When the return value is the child/cell index,
-2 is returned for objects whose index is greater
than the maximum value supported by the platform
API.
Using a non-negative value would mean that the
index would refer to *another* actually existing
child. A child index of -1 on the other hand
tends to be interpreted as "child is invalid" or
"object isn't actually a child of its (previous)
parent any more)". For the Orca case, this would
result in objects with a child index of -1
not being announced, as they are considered
"zombies" [6].

What's still somewhat problematic is the case where
more than 2^31 children are *selected*, since access
to those children still happens by the index into
the selection in the platform APIs, and not all
selected items are accessible this way.
(Screen readers usually just retrieve
the first and last element from the selection and
announce those.)

Orca already seems to apply different handling for the
case for fully selected rows and columns, so
"All cells selected" or "Columns ... to ... selected"
is announced just fine even if more than 2^31
cells are selected.

(Side note: While Microsoft User Interface
Automation - UIA - also uses 32-bit indices, it also
has specific methods in the ISelectionProvider2
interface that allow to explicitly retrieve the
first and last selected item,
`ISelectionProvider2::get_FirstSelectedItem` and
`ISelectionProvider2::get_LastSelectedItem`, but
we currently don't support UIA on Windows.)

Bound checks at the beginning of the methods from the
`XAccessibleContext`, `XAccessibleSelection` and
`XAccessibleTable` interfaces that take a child index
(or in helper methods called by those) should generally
already prevent too large indices from being passed to
the methods in the lower layer code that take smaller
integer types. Such bound checking has been
been added in various places where it wasn't present yet.
If there any remaining issues of this
kind that show after this commit, they can probably be
solved in a similar way (s.e.g. the change to
`AccessibleBrowseBox::getAccessibleChild` in this
commit).
A few asserts were also added at
places where my understanding is that values shouldn't
be larger than what is supported by a called method
anyway.

A test case will be added in a following change.

[1] https://gitlab.gnome.org/GNOME/orca/-/merge_requests/131
[2] https://codereview.qt-project.org/c/qt/qtbase/+/428566
[3] https://codereview.qt-project.org/c/qt/qtbase/+/428567
[4] https://gerrit.libreoffice.org/c/core/+/138750
[5] https://codereview.qt-project.org/c/qt/qtbase/+/430157
[6] https://gitlab.gnome.org/GNOME/orca/-/blob/82c8542002e36e0d3d918088d583162d25136143/src/orca/script_utilities.py#L5155

Change-Id: I3af590c988b0e6754fc72545918412f39e8fea07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139258
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2022-09-02 15:47:37 +02:00
parent 38671e21d7
commit 206543c7be
266 changed files with 1706 additions and 1468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessibility/inc/extended/AccessibleBrowseBox.hxx
+3 -3
View File
@@ -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. */
accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+1 -1
View File
@@ -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.
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+3 -3
View File
@@ -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
accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+8 -9
View File
@@ -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>
accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+3 -3
View File
@@ -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;
accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+2 -2
View File
@@ -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
accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+8 -8
View File
@@ -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 );
};
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+3 -3
View File
@@ -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.
*/
accessibility/inc/extended/AccessibleGridControl.hxx
+4 -4
View File
@@ -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();
};
accessibility/inc/extended/AccessibleGridControlBase.hxx
+1 -1
View File
@@ -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.
accessibility/inc/extended/AccessibleGridControlHeader.hxx
+2 -2
View File
@@ -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
accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+3 -3
View File
@@ -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;
accessibility/inc/extended/AccessibleGridControlTable.hxx
+7 -7
View File
@@ -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. */
accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+7 -7
View File
@@ -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 );
};
accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+3 -3
View File
@@ -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.
*/
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+2 -2
View File
@@ -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;
accessibility/inc/extended/accessibleiconchoicectrl.hxx
+7 -7
View File
@@ -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;
};
accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+3 -3
View File
@@ -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;
accessibility/inc/extended/accessiblelistbox.hxx
+7 -7
View File
@@ -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:
accessibility/inc/extended/accessiblelistboxentry.hxx
+8 -8
View File
@@ -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;
accessibility/inc/extended/accessibletabbar.hxx
+3 -3
View File
@@ -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;
accessibility/inc/extended/accessibletabbarpage.hxx
+3 -3
View File
@@ -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;
accessibility/inc/extended/accessibletabbarpagelist.hxx
+8 -8
View File
@@ -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;
};
accessibility/inc/extended/accessibletablistbox.hxx
+2 -2
View File
@@ -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;
accessibility/inc/extended/accessibletablistboxtable.hxx
+7 -7
View File
@@ -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;
};
accessibility/inc/extended/textwindowaccessibility.hxx
+5 -5
View File
@@ -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;
accessibility/inc/standard/accessiblemenubasecomponent.hxx
+2 -2
View File
@@ -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 );
accessibility/inc/standard/accessiblemenucomponent.hxx
+7 -7
View File
@@ -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;
};
accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+3 -3
View File
@@ -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;
accessibility/inc/standard/vclxaccessiblebox.hxx
+3 -3
View File
@@ -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();
};
accessibility/inc/standard/vclxaccessibleedit.hxx
+2 -2
View File
@@ -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
accessibility/inc/standard/vclxaccessibleheaderbar.hxx
+2 -2
View File
@@ -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
accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+3 -3
View File
@@ -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;
accessibility/inc/standard/vclxaccessiblelist.hxx
+9 -9
View File
@@ -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.
accessibility/inc/standard/vclxaccessiblelistitem.hxx
+3 -3
View File
@@ -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;
accessibility/inc/standard/vclxaccessiblemenu.hxx
+8 -8
View File
@@ -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;
accessibility/inc/standard/vclxaccessiblemenubar.hxx
+1 -1
View File
@@ -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
accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
+1 -1
View File
@@ -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
accessibility/inc/standard/vclxaccessiblestatusbar.hxx
+2 -2
View File
@@ -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;
accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+3 -3
View File
@@ -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;
accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+8 -8
View File
@@ -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;
};
accessibility/inc/standard/vclxaccessibletabpage.hxx
+4 -4
View File
@@ -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;
accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
+1 -1
View File
@@ -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;
};
accessibility/inc/standard/vclxaccessibletextfield.hxx
+2 -2
View File
@@ -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;
accessibility/inc/standard/vclxaccessibletoolbox.hxx
+8 -8
View File
@@ -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(
accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+3 -3
View File
@@ -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;
accessibility/source/extended/AccessibleBrowseBox.cxx
+6 -3
View File
@@ -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 )
accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+4 -4
View File
@@ -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);
accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+4 -4
View File
@@ -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 )
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+11 -10
View File
@@ -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() )
accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+4 -4
View File
@@ -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;
accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+2 -2
View File
@@ -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();
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+10 -10
View File
@@ -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 );
accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+4 -4
View File
@@ -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( )
accessibility/source/extended/AccessibleGridControl.cxx
+6 -6
View File
@@ -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)
accessibility/source/extended/AccessibleGridControlBase.cxx
+4 -4
View File
@@ -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() )
accessibility/source/extended/AccessibleGridControlHeader.cxx
+2 -2
View File
@@ -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;
accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+4 -5
View File
@@ -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
accessibility/source/extended/AccessibleGridControlTable.cxx
+11 -10
View File
@@ -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;
accessibility/source/extended/AccessibleGridControlTableBase.cxx
+11 -11
View File
@@ -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 );
}
accessibility/source/extended/AccessibleGridControlTableCell.cxx
+6 -6
View File
@@ -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();
accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+2 -2
View File
@@ -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();
accessibility/source/extended/accessibleiconchoicectrl.cxx
+17 -8
View File
@@ -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 );
accessibility/source/extended/accessibleiconchoicectrlentry.cxx
+3 -3
View File
@@ -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 );
accessibility/source/extended/accessiblelistbox.cxx
+11 -8
View File
@@ -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 );
accessibility/source/extended/accessiblelistboxentry.cxx
+23 -14
View File
@@ -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 )
accessibility/source/extended/accessibletabbar.cxx
+4 -4
View File
@@ -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();
accessibility/source/extended/accessibletabbarpage.cxx
+4 -4
View File
@@ -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 );
accessibility/source/extended/accessibletabbarpagelist.cxx
+10 -10
View File
@@ -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 );
accessibility/source/extended/accessibletablistbox.cxx
+2 -2
View File
@@ -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();
accessibility/source/extended/accessibletablistboxtable.cxx
+8 -8
View File
@@ -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() );
accessibility/source/extended/textwindowaccessibility.cxx
+8 -8
View File
@@ -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)
accessibility/source/standard/accessiblemenubasecomponent.cxx
+3 -3
View File
@@ -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() )
accessibility/source/standard/accessiblemenucomponent.cxx
+10 -10
View File
@@ -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 );
accessibility/source/standard/accessiblemenuitemcomponent.cxx
+3 -3
View File
@@ -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 );
accessibility/source/standard/vclxaccessiblebox.cxx
+5 -5
View File
@@ -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();
accessibility/source/standard/vclxaccessibleedit.cxx
+2 -2
View File
@@ -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();
}
accessibility/source/standard/vclxaccessibleheaderbar.cxx
+3 -3
View File
@@ -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;
accessibility/source/standard/vclxaccessibleheaderbaritem.cxx
+3 -3
View File
@@ -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;
accessibility/source/standard/vclxaccessiblelist.cxx
+11 -11
View File
@@ -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;
accessibility/source/standard/vclxaccessiblelistitem.cxx
+3 -3
View File
@@ -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;
accessibility/source/standard/vclxaccessiblemenu.cxx
+11 -11
View File
@@ -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 );
accessibility/source/standard/vclxaccessiblemenubar.cxx
+2 -2
View File
@@ -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 )
{
accessibility/source/standard/vclxaccessiblepopupmenu.cxx
+1 -1
View File
@@ -54,7 +54,7 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames()
// XAccessibleContext
sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( )
sal_Int64 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( )
{
OExternalLockGuard aGuard( this );
accessibility/source/standard/vclxaccessiblestatusbar.cxx
+3 -3
View File
@@ -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 );
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
+4 -4
View File
@@ -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 );
accessibility/source/standard/vclxaccessibletabcontrol.cxx
+9 -9
View File
@@ -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 );
accessibility/source/standard/vclxaccessibletabpage.cxx
+7 -7
View File
@@ -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() )
accessibility/source/standard/vclxaccessibletabpagewindow.cxx
+1 -1
View File
@@ -122,7 +122,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( )
}
sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( )
sal_Int64 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( )
{
OExternalLockGuard aGuard( this );
accessibility/source/standard/vclxaccessibletextfield.cxx
+2 -2
View File
@@ -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();
}
accessibility/source/standard/vclxaccessibletoolbox.cxx
+16 -24
View File
@@ -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() )
accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+3 -3
View File
@@ -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 );
basctl/source/accessibility/accessibledialogcontrolshape.cxx
+5 -5
View File
@@ -304,13 +304,13 @@ Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleConte
}
// XAccessibleContext
sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount()
sal_Int64 AccessibleDialogControlShape::getAccessibleChildCount()
{
return 0;
}
Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i )
Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int64 i )
{
OExternalLockGuard aGuard( this );
@@ -333,18 +333,18 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( )
}
sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( )
sal_Int64 AccessibleDialogControlShape::getAccessibleIndexInParent( )
{
OExternalLockGuard aGuard( this );
sal_Int32 nIndexInParent = -1;
sal_Int64 nIndexInParent = -1;
Reference< XAccessible > xParent( getAccessibleParent() );
if ( xParent.is() )
{
Reference< XAccessibleContext > xParentContext( xParent->getAccessibleContext() );
if ( xParentContext.is() )
{
for ( sal_Int32 i = 0, nCount = xParentContext->getAccessibleChildCount(); i < nCount; ++i )
for ( sal_Int64 i = 0, nCount = xParentContext->getAccessibleChildCount(); i < nCount; ++i )
{
Reference< XAccessible > xChild( xParentContext->getAccessibleChild( i ) );
if ( xChild.is() )
basctl/source/accessibility/accessibledialogwindow.cxx
+12 -12
View File
@@ -554,7 +554,7 @@ Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( )
}
// XAccessibleContext
sal_Int32 AccessibleDialogWindow::getAccessibleChildCount()
sal_Int64 AccessibleDialogWindow::getAccessibleChildCount()
{
OExternalLockGuard aGuard( this );
@@ -562,7 +562,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount()
}
Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i )
Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int64 i )
{
OExternalLockGuard aGuard( this );
@@ -605,11 +605,11 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( )
}
sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( )
sal_Int64 AccessibleDialogWindow::getAccessibleIndexInParent( )
{
OExternalLockGuard aGuard( this );
sal_Int32 nIndexInParent = -1;
sal_Int64 nIndexInParent = -1;
if ( m_pDialogWindow )
{
vcl::Window* pParent = m_pDialogWindow->GetAccessibleParentWindow();
@@ -830,7 +830,7 @@ OUString AccessibleDialogWindow::getToolTipText( )
// XAccessibleSelection
void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex )
void AccessibleDialogWindow::selectAccessibleChild( sal_Int64 nChildIndex )
{
OExternalLockGuard aGuard( this );
@@ -849,7 +849,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex )
}
sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex )
sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int64 nChildIndex )
{
OExternalLockGuard aGuard( this );
@@ -881,13 +881,13 @@ void AccessibleDialogWindow::selectAllAccessibleChildren( )
}
sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( )
sal_Int64 AccessibleDialogWindow::getSelectedAccessibleChildCount( )
{
OExternalLockGuard aGuard( this );
sal_Int32 nRet = 0;
sal_Int64 nRet = 0;
for ( sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
{
if ( isAccessibleChildSelected( i ) )
++nRet;
@@ -897,7 +897,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( )
}
Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex )
{
OExternalLockGuard aGuard( this );
@@ -906,7 +906,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
Reference< XAccessible > xChild;
for ( sal_Int32 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
for ( sal_Int64 i = 0, j = 0, nCount = getAccessibleChildCount(); i < nCount; ++i )
{
if ( isAccessibleChildSelected( i ) && ( j++ == nSelectedChildIndex ) )
{
@@ -919,7 +919,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal
}
void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex )
void AccessibleDialogWindow::deselectAccessibleChild( sal_Int64 nChildIndex )
{
OExternalLockGuard aGuard( this );
basctl/source/inc/accessibledialogcontrolshape.hxx
+3 -3
View File
@@ -100,10 +100,10 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override;
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override;
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override;
virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
virtual OUString SAL_CALL getAccessibleDescription( ) override;
virtual OUString SAL_CALL getAccessibleName( ) override;
basctl/source/inc/accessibledialogwindow.hxx
+8 -8
View File
@@ -114,10 +114,10 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override;
// XAccessibleContext
virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override;
virtual sal_Int64 SAL_CALL getAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override;
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override;
virtual sal_Int64 SAL_CALL getAccessibleIndexInParent( ) override;
virtual sal_Int16 SAL_CALL getAccessibleRole( ) override;
virtual OUString SAL_CALL getAccessibleDescription( ) override;
virtual OUString SAL_CALL getAccessibleName( ) override;
@@ -137,13 +137,13 @@ public:
virtual OUString SAL_CALL getToolTipText( ) override;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override;
virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override;
virtual void SAL_CALL clearAccessibleSelection() override;
virtual void SAL_CALL selectAllAccessibleChildren( ) override;
virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override;
virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) override;
};
} // namespace basctl
chart2/source/controller/accessibility/AccessibleBase.cxx
+5 -5
View File
@@ -434,7 +434,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext()
}
// ________ AccessibleBase::XAccessibleContext ________
sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
sal_Int64 SAL_CALL AccessibleBase::getAccessibleChildCount()
{
ClearableMutexGuard aGuard( m_aMutex );
if( ! m_bMayHaveChildren ||
@@ -453,12 +453,12 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
return ImplGetAccessibleChildCount();
}
sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const
sal_Int64 AccessibleBase::ImplGetAccessibleChildCount() const
{
return m_aChildList.size();
}
Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i )
Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int64 i )
{
CheckDisposeState();
Reference< XAccessible > xResult;
@@ -477,7 +477,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32
return xResult;
}
Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const
Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int64 i ) const
{
Reference< XAccessible > xResult;
@@ -510,7 +510,7 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent()
return aResult;
}
sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
sal_Int64 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
{
CheckDisposeState();
chart2/source/controller/accessibility/AccessibleChartElement.cxx
+2 -2
View File
@@ -115,7 +115,7 @@ void AccessibleChartElement::InitTextEdit()
// Interfaces
// ________ AccessibleBase::XAccessibleContext ________
Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const
Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int64 i ) const
{
Reference< XAccessible > xResult;
@@ -127,7 +127,7 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal
return xResult;
}
sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const
sal_Int64 AccessibleChartElement::ImplGetAccessibleChildCount() const
{
if( m_bHasText )
{
chart2/source/controller/accessibility/AccessibleChartElement.hxx
+2 -2
View File
@@ -61,8 +61,8 @@ public:
// ________ AccessibleBase ________
virtual bool ImplUpdateChildren() override;
virtual css::uno::Reference< css::accessibility::XAccessible >
ImplGetAccessibleChildById( sal_Int32 i ) const override;
virtual sal_Int32 ImplGetAccessibleChildCount() const override;
ImplGetAccessibleChildById( sal_Int64 i ) const override;
virtual sal_Int64 ImplGetAccessibleChildCount() const override;
// ________ XAccessibleContext ________
virtual OUString SAL_CALL getAccessibleName() override;
chart2/source/controller/accessibility/AccessibleChartShape.cxx
+3 -3
View File
@@ -78,9 +78,9 @@ OUString AccessibleChartShape::getImplementationName()
}
// ________ XAccessibleContext ________
sal_Int32 AccessibleChartShape::getAccessibleChildCount()
sal_Int64 AccessibleChartShape::getAccessibleChildCount()
{
sal_Int32 nCount(0);
sal_Int64 nCount(0);
if ( m_pAccShape.is() )
{
nCount = m_pAccShape->getAccessibleChildCount();
@@ -88,7 +88,7 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount()
return nCount;
}
Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i )
Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int64 i )
{
Reference< XAccessible > xChild;
if ( m_pAccShape.is() )

Some files were not shown because too many files have changed in this diff Show More