diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2022-09-02 13:06:08 +0200 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2022-09-02 15:47:37 +0200 |
commit | 206543c7bef58fc559852553a3b2faba0b604259 (patch) | |
tree | 4fc3e0e57e6f9b50e276998fc04241035a2dffb6 /sd | |
parent | 38671e21d7dbcd5019912b9468305018de0c922e (diff) |
[API CHANGE] tdf#150683 a11y: Switch a11y child index to 64 bit
With 16k column support in Calc enabled by default in
commit 4c5f8ccf0a2320432b8fe91add1dcadf54d9fd58
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>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/qa/unit/a11y/layout.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleOutlineView.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessiblePageShape.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 35 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 8 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleOutlineView.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessiblePageShape.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 6 | ||||
-rw-r--r-- | sd/source/ui/inc/AccessibleSlideSorterView.hxx | 16 |
13 files changed, 73 insertions, 60 deletions
diff --git a/sd/qa/unit/a11y/layout.cxx b/sd/qa/unit/a11y/layout.cxx index 9af31dff8c80..342590b31fba 100644 --- a/sd/qa/unit/a11y/layout.cxx +++ b/sd/qa/unit/a11y/layout.cxx @@ -54,7 +54,7 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestImpressDefaultLayout) * shape (subtitle) * paragraph */ - CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDocumentContext->getAccessibleChildCount()); + CPPUNIT_ASSERT_EQUAL(sal_Int64(3), xDocumentContext->getAccessibleChildCount()); CPPUNIT_ASSERT_EQUAL( OUString("PresentationTitle "), xDocumentContext->getAccessibleChild(1)->getAccessibleContext()->getAccessibleName()); diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index f4809fa31353..e6896d0d3014 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -224,7 +224,7 @@ Reference<XAccessible> SAL_CALL return AccessibleContextBase::getAccessibleParent(); } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleDocumentViewBase::getAccessibleChildCount() { ThrowIfDisposed (); @@ -236,7 +236,7 @@ sal_Int32 SAL_CALL } Reference<XAccessible> SAL_CALL - AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex) + AccessibleDocumentViewBase::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); @@ -263,8 +263,8 @@ uno::Reference<XAccessible > SAL_CALL ::osl::MutexGuard aGuard (m_aMutex); uno::Reference<XAccessible> xChildAtPosition; - sal_Int32 nChildCount = getAccessibleChildCount (); - for (sal_Int32 i=nChildCount-1; i>=0; --i) + sal_Int64 nChildCount = getAccessibleChildCount (); + for (sal_Int64 i=nChildCount-1; i>=0; --i) { Reference<XAccessible> xChild (getAccessibleChild (i)); if (xChild.is()) @@ -632,16 +632,16 @@ uno::Reference< XAccessibleContext > return this; } -// return sal_False in default case +// return false in default case bool - AccessibleDocumentViewBase::implIsSelected( sal_Int32 ) + AccessibleDocumentViewBase::implIsSelected( sal_Int64 ) { return false; } -// return nothing in default case +// do nothing in default case void - AccessibleDocumentViewBase::implSelect( sal_Int32, bool ) + AccessibleDocumentViewBase::implSelect( sal_Int64, bool ) { } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index f6111962a8a2..690a8c865f2c 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -182,12 +182,12 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleDrawDocumentView::getAccessibleChildCount() { ThrowIfDisposed (); - tools::Long nChildCount = AccessibleDocumentViewBase::getAccessibleChildCount(); + sal_Int64 nChildCount = AccessibleDocumentViewBase::getAccessibleChildCount(); // Forward request to children manager. if (mpChildrenManager != nullptr) @@ -197,14 +197,14 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible> SAL_CALL - AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex) + AccessibleDrawDocumentView::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); ::osl::ClearableMutexGuard aGuard (m_aMutex); // Take care of children of the base class. - sal_Int32 nCount = AccessibleDocumentViewBase::getAccessibleChildCount(); + sal_Int64 nCount = AccessibleDocumentViewBase::getAccessibleChildCount(); if (nCount > 0) { if (nIndex < nCount) @@ -566,7 +566,7 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName() /** Return selection state of specified child */ bool - AccessibleDrawDocumentView::implIsSelected( sal_Int32 nAccessibleChildIndex ) + AccessibleDrawDocumentView::implIsSelected( sal_Int64 nAccessibleChildIndex ) { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); @@ -607,7 +607,7 @@ bool the XSelectionSupplier of the controller. */ void - AccessibleDrawDocumentView::implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) + AccessibleDrawDocumentView::implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) { const SolarMutexGuard aSolarGuard; uno::Reference< view::XSelectionSupplier > xSel( mxController, uno::UNO_QUERY ); @@ -628,7 +628,7 @@ void uno::Reference< drawing::XShapes > xShapes = drawing::ShapeCollection::create( comphelper::getProcessComponentContext()); - for(sal_Int32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for(sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { AccessibleShape* pAcc = comphelper::getFromUnoTunnel<AccessibleShape>( getAccessibleChild( i ) ); diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 4e020efeff9e..d7277c74c71b 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -93,7 +93,7 @@ void AccessibleOutlineView::ViewForwarderChanged() //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessibleOutlineView::getAccessibleChildCount() { ThrowIfDisposed (); @@ -103,7 +103,7 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible> SAL_CALL - AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex) + AccessibleOutlineView::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed (); // Forward request to children manager. diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index c9de70705d9d..894f7b724b42 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -55,7 +55,7 @@ AccessiblePageShape::~AccessiblePageShape() //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL AccessiblePageShape::getAccessibleChildCount() { return 0; @@ -65,7 +65,7 @@ sal_Int32 SAL_CALL an exception for a wrong index. */ uno::Reference<XAccessible> SAL_CALL - AccessiblePageShape::getAccessibleChild( sal_Int32 ) + AccessiblePageShape::getAccessibleChild( sal_Int64 ) { throw lang::IndexOutOfBoundsException ("page shape has no children", static_cast<uno::XWeak*>(this)); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index 55629979d52d..c22077fe42c7 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -105,13 +105,13 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() { ThrowIfDisposed(); return 0; } -Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int32 ) +Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild (sal_Int64 ) { ThrowIfDisposed(); throw lang::IndexOutOfBoundsException(); @@ -123,19 +123,19 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent return mxParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - sal_Int32 nIndexInParent(-1); + sal_Int64 nIndexInParent(-1); if (mxParent.is()) { Reference<XAccessibleContext> xParentContext (mxParent->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount (xParentContext->getAccessibleChildCount()); + for (sal_Int64 i=0; i<nChildCount; ++i) if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 6a569171cb67..4c197a71279a 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -193,7 +193,7 @@ Reference<XAccessibleContext > SAL_CALL //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -201,7 +201,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() } Reference<XAccessible > SAL_CALL - AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) + AccessibleSlideSorterView::getAccessibleChild (sal_Int64 nIndex) { ThrowIfDisposed(); ::osl::MutexGuard aGuard (m_aMutex); @@ -228,18 +228,18 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent( return xParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() +sal_Int64 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() { OSL_ASSERT(getAccessibleParent().is()); ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; - sal_Int32 nIndexInParent(-1); + sal_Int64 nIndexInParent(-1); Reference<XAccessibleContext> xParentContext (getAccessibleParent()->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount (xParentContext->getAccessibleChildCount()); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount (xParentContext->getAccessibleChildCount()); + for (sal_Int64 i=0; i<nChildCount; ++i) if (xParentContext->getAccessibleChild(i).get() == static_cast<XAccessible*>(this)) { @@ -493,11 +493,14 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground() //===== XAccessibleSelection ================================================== -void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChildIndex) +void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int64 nChildIndex) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); if (pChild == nullptr) throw lang::IndexOutOfBoundsException(); @@ -505,12 +508,15 @@ void SAL_CALL AccessibleSlideSorterView::selectAccessibleChild (sal_Int32 nChild mrSlideSorter.GetController().GetPageSelector().SelectPage(pChild->GetPageNumber()); } -sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int32 nChildIndex) +sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int64 nChildIndex) { ThrowIfDisposed(); bool bIsSelected = false; const SolarMutexGuard aSolarGuard; + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); if (pChild == nullptr) throw lang::IndexOutOfBoundsException(); @@ -537,7 +543,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren() mrSlideSorter.GetController().GetPageSelector().SelectAllPages(); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; @@ -545,10 +551,14 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() } Reference<XAccessible > SAL_CALL - AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int32 nSelectedChildIndex ) + AccessibleSlideSorterView::getSelectedAccessibleChild (sal_Int64 nSelectedChildIndex ) { ThrowIfDisposed (); const SolarMutexGuard aSolarGuard; + + if (nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + Reference<XAccessible> xChild; ::sd::slidesorter::controller::PageSelector& rSelector ( @@ -572,11 +582,14 @@ Reference<XAccessible > SAL_CALL return xChild; } -void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChildIndex) +void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int64 nChildIndex) { ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; + if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) + throw lang::IndexOutOfBoundsException(); + AccessibleSlideSorterObject* pChild = mpImpl->GetAccessibleChild(nChildIndex); if (pChild == nullptr) throw lang::IndexOutOfBoundsException(); diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index e940357f18ce..a514cfc42462 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -139,14 +139,14 @@ public: /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** This implementation either returns the active accessible OLE object if it exists and the given index is 0 or throws an exception. */ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; //===== XAccessibleComponent ============================================ @@ -232,11 +232,11 @@ private: // return sal_False in default case virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) override; + implIsSelected( sal_Int64 nAccessibleChildIndex ) override; // return nothing in default case virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; + implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; protected: /// The API window that is made accessible. diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 202edd0ea88d..924723a31120 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -60,11 +60,11 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual OUString SAL_CALL getAccessibleName() override; @@ -107,7 +107,7 @@ private: getSupportedServiceNames() override; virtual bool - implIsSelected( sal_Int32 nAccessibleChildIndex ) override; + implIsSelected( sal_Int64 nAccessibleChildIndex ) override; /** Select or deselect the specified child or all children if the given index has the special value ACCESSIBLE_SELECTION_CHILD_ALL. @@ -123,7 +123,7 @@ private: reps. children. */ virtual void - implSelect( sal_Int32 nAccessibleChildIndex, bool bSelect ) override; + implSelect( sal_Int64 nAccessibleChildIndex, bool bSelect ) override; ::sd::ViewShell* mpSdViewSh; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 5fa1df7c505c..ddff1b465289 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -55,11 +55,11 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual OUString SAL_CALL getAccessibleName() override; //===== XAccessibleEventBroadcaster ======================================== diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index 06dc76555214..1e7568ab0038 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -58,7 +58,7 @@ public: //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Return the specified child. @@ -71,7 +71,7 @@ public: Throws always an exception because there are no children. */ virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; //===== XAccessibleComponent ============================================ diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 31ba6cc4d053..97bea8519768 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -90,16 +90,16 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int16 SAL_CALL diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index ab5c316f77eb..0cbaf62ed586 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -99,19 +99,19 @@ public: //===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or throw exception. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 nIndex) override; + getAccessibleChild (sal_Int64 nIndex) override; /// Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /// Return this object's role. @@ -189,10 +189,10 @@ public: //===== XAccessibleSelection ============================================== virtual void SAL_CALL - selectAccessibleChild (sal_Int32 nChildIndex) override; + selectAccessibleChild (sal_Int64 nChildIndex) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + isAccessibleChildSelected( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -200,15 +200,15 @@ public: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; //===== XServiceInfo ==================================================== |