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 /sc | |
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 'sc')
29 files changed, 188 insertions, 190 deletions
diff --git a/sc/qa/complex/calcPreview/ViewForwarder.java b/sc/qa/complex/calcPreview/ViewForwarder.java index 4abbedc9b09f..d1490013a9fa 100644 --- a/sc/qa/complex/calcPreview/ViewForwarder.java +++ b/sc/qa/complex/calcPreview/ViewForwarder.java @@ -404,7 +404,7 @@ public class ViewForwarder { accPC = UnoRuntime.queryInterface(XAccessibleComponent.class, parent); - int cCount = 0; + long cCount = 0; try { cCount = parent.getAccessibleContext().getAccessibleChildCount(); @@ -416,7 +416,7 @@ public class ViewForwarder { return; } - for (int i=0; i<cCount; i++) { + for (long i=0; i<cCount; i++) { try { XAccessible xA = parent.getAccessibleContext().getAccessibleChild(i); System.out.println("NAME object " + i + ": " + xA.getAccessibleContext().getAccessibleName()); @@ -691,7 +691,7 @@ public class ViewForwarder { e.printStackTrace(); } - int childCount = 0; + long childCount = 0; childCount = parent.getAccessibleContext().getAccessibleChildCount(); System.out.println("ChildCount: "+childCount); diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 56aa59a8b237..854ad84f961d 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -53,7 +53,7 @@ rtl::Reference<ScAccessibleCell> ScAccessibleCell::create( const uno::Reference<XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc) { @@ -67,7 +67,7 @@ ScAccessibleCell::ScAccessibleCell( const uno::Reference<XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc) : @@ -211,14 +211,14 @@ tools::Rectangle ScAccessibleCell::GetBoundingBox() const //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleCell::getAccessibleChildCount() { return AccessibleStaticTextBase::getAccessibleChildCount(); } uno::Reference< XAccessible > SAL_CALL - ScAccessibleCell::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleCell::getAccessibleChild(sal_Int64 nIndex) { return AccessibleStaticTextBase::getAccessibleChild(nIndex); } diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 22c74bcd1389..033c79566cd5 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -50,7 +50,7 @@ ScAccessibleCellBase::ScAccessibleCellBase( const uno::Reference<XAccessible>& rxParent, ScDocument* pDoc, const ScAddress& rCellAddress, - sal_Int32 nIndex) + sal_Int64 nIndex) : ScAccessibleContextBase(rxParent, AccessibleRole::TABLE_CELL), maCellAddress(rCellAddress), @@ -186,7 +186,7 @@ void SAL_CALL ScAccessibleCellBase::release() //===== XAccessibleContext ============================================== -sal_Int32 +sal_Int64 ScAccessibleCellBase::getAccessibleIndexInParent() { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 3dc2034b36da..0fc5b42a1ffe 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -222,14 +222,14 @@ sal_Int32 SAL_CALL ScAccessibleContextBase::getBackground( ) //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleContextBase::getAccessibleChildCount() { OSL_FAIL("should be implemented in the abrevated class"); return 0; } uno::Reference<XAccessible> SAL_CALL - ScAccessibleContextBase::getAccessibleChild(sal_Int32 /* nIndex */) + ScAccessibleContextBase::getAccessibleChild(sal_Int64 /* nIndex */) { OSL_FAIL("should be implemented in the abrevated class"); return uno::Reference<XAccessible>(); @@ -241,7 +241,7 @@ uno::Reference<XAccessible> SAL_CALL return mxParent; } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleContextBase::getAccessibleIndexInParent() { SolarMutexGuard aGuard; @@ -249,7 +249,7 @@ sal_Int32 SAL_CALL // Use a simple but slow solution for now. Optimize later. // Return -1 to indicate that this object's parent does not know about the // object. - sal_Int32 nIndex(-1); + sal_Int64 nIndex(-1); // Iterate over all the parent's children and search for this object. if (mxParent.is()) @@ -258,8 +258,8 @@ sal_Int32 SAL_CALL mxParent->getAccessibleContext()); if (xParentContext.is()) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for (sal_Int32 i=0; i<nChildCount; ++i) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for (sal_Int64 i=0; i<nChildCount; ++i) { uno::Reference<XAccessible> xChild (xParentContext->getAccessibleChild (i)); if (xChild.is() && xChild.get() == this) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 3155affcea98..9d7e2bab5799 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -274,13 +274,13 @@ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getBackground( ) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvRuler::getAccessibleChildCount() { ensureAlive(); return 0; } -Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int32 /* nIndex */ ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvRuler::getAccessibleChild( sal_Int64 /* nIndex */ ) { ensureAlive(); throw IndexOutOfBoundsException(); @@ -813,7 +813,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getBackground( ) // XAccessibleContext --------------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() { SolarMutexGuard aGuard; ensureAlive(); @@ -822,7 +822,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleChildCount() Reference<XAccessible> ScAccessibleCsvGrid::getAccessibleCell(sal_Int32 nRow, sal_Int32 nColumn) { - sal_Int32 nIndex = implGetIndex(nRow, nColumn); + sal_Int64 nIndex = implGetIndex(nRow, nColumn); XAccessibleSet::iterator aI = maAccessibleChildren.lower_bound(nIndex); if (aI != maAccessibleChildren.end() && !(maAccessibleChildren.key_comp()(nIndex, aI->first))) @@ -836,7 +836,7 @@ Reference<XAccessible> ScAccessibleCsvGrid::getAccessibleCell(sal_Int32 nRow, sa return xNew; } -Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1006,7 +1006,7 @@ sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleSelected( sal_Int32 /* nRow * return isAccessibleColumnSelected( nColumn ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1014,7 +1014,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleIndex( sal_Int32 nRow, sal_ return implGetIndex( nRow, nColumn ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1022,7 +1022,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRow( sal_Int32 nChildIndex return implGetRow( nChildIndex ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1032,7 +1032,7 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd // XAccessibleSelection ------------------------------------------------------- -void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1044,7 +1044,7 @@ void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex implSelectColumn( nColumn, true ); } -sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ScAccessibleCsvGrid::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1065,14 +1065,14 @@ void SAL_CALL ScAccessibleCsvGrid::selectAllAccessibleChildren() selectAccessibleChild( 0 ); } -sal_Int32 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChildCount() { SolarMutexGuard aGuard; ensureAlive(); - return implGetRowCount() * implGetSelColumnCount(); + return static_cast<sal_Int64>(implGetRowCount()) * static_cast<sal_Int64>(implGetSelColumnCount()); } -Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); @@ -1085,10 +1085,11 @@ Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getSelectedAccessibleChil return getAccessibleCellAt( nRow, nColumn ); } -void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) +void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; ensureAlive(); + ensureValidIndex(nSelectedChildIndex); sal_Int32 nColumns = implGetSelColumnCount(); if( nColumns == 0 ) throw IndexOutOfBoundsException(); @@ -1194,7 +1195,7 @@ OUString SAL_CALL ScAccessibleCsvGrid::getAccessibleDescription() return ScResId( STR_ACC_CSVGRID_DESCR ); } -void ScAccessibleCsvGrid::ensureValidIndex( sal_Int32 nIndex ) const +void ScAccessibleCsvGrid::ensureValidIndex( sal_Int64 nIndex ) const { if( (nIndex < 0) || (nIndex >= implGetCellCount()) ) throw IndexOutOfBoundsException(); @@ -1329,17 +1330,17 @@ sal_Int32 SAL_CALL ScAccessibleCsvCell::getBackground( ) // XAccessibleContext ----------------------------------------------------- -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleCsvCell::getAccessibleChildCount() { return AccessibleStaticTextBase::getAccessibleChildCount(); } -Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int32 nIndex ) +Reference< XAccessible > SAL_CALL ScAccessibleCsvCell::getAccessibleChild( sal_Int64 nIndex ) { return AccessibleStaticTextBase::getAccessibleChild( nIndex ); } -sal_Int32 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessibleCsvCell::getAccessibleIndexInParent() { SolarMutexGuard aGuard; ensureAlive(); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b8a40b814b00..475dd9597673 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1048,8 +1048,8 @@ bool ScChildrenShapes::FindSelectedShapesChanges(const uno::Reference<drawing::X static_cast< ::accessibility::AccessibleShape* >(xAccGroupShape.get()); if( pAccGroupShape ) { - sal_Int32 nCount = pAccGroupShape->getAccessibleChildCount(); - for( sal_Int32 i = 0; i < nCount; i++ ) + sal_Int64 nCount = pAccGroupShape->getAccessibleChildCount(); + for( sal_Int64 i = 0; i < nCount; i++ ) { uno::Reference<XAccessible> xAccShape = pAccGroupShape->getAccessibleChild(i); if (xAccShape.is()) @@ -1677,12 +1677,12 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) //===== XAccessibleContext ============================================== /// Return the number of currently visible children. -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleDocument::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nCount(1); + sal_Int64 nCount(1); if (mpChildrenShapes) nCount = mpChildrenShapes->GetCount(); // returns the count of the shapes inclusive the table @@ -1694,14 +1694,14 @@ sal_Int32 SAL_CALL /// Return the specified child or NULL if index is invalid. uno::Reference<XAccessible> SAL_CALL - ScAccessibleDocument::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleDocument::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); uno::Reference<XAccessible> xAccessible; if (nIndex >= 0) { - sal_Int32 nCount(1); + sal_Int64 nCount(1); if (mpChildrenShapes) { xAccessible = mpChildrenShapes->Get(nIndex); // returns NULL if it is the table or out of range @@ -1785,7 +1785,7 @@ OUString SAL_CALL ///===== XAccessibleSelection =========================================== void SAL_CALL - ScAccessibleDocument::selectAccessibleChild( sal_Int32 nChildIndex ) + ScAccessibleDocument::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1814,7 +1814,7 @@ void SAL_CALL } sal_Bool SAL_CALL - ScAccessibleDocument::isAccessibleChildSelected( sal_Int32 nChildIndex ) + ScAccessibleDocument::isAccessibleChildSelected( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1871,12 +1871,12 @@ void SAL_CALL } } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleDocument::getSelectedAccessibleChildCount( ) { SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nCount(0); + sal_Int64 nCount(0); if (mpChildrenShapes) nCount = mpChildrenShapes->GetSelectedCount(); @@ -1891,14 +1891,14 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible > SAL_CALL - ScAccessibleDocument::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + ScAccessibleDocument::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); uno::Reference<XAccessible> xAccessible; if (mpChildrenShapes) { - sal_Int32 nCount(getSelectedAccessibleChildCount()); //all shapes and the table + sal_Int64 nCount(getSelectedAccessibleChildCount()); //all shapes and the table if (nSelectedChildIndex < 0 || nSelectedChildIndex >= nCount) throw lang::IndexOutOfBoundsException(); @@ -1918,7 +1918,7 @@ uno::Reference<XAccessible > SAL_CALL } void SAL_CALL - ScAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex ) + ScAccessibleDocument::deselectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 666965a7aaf1..8d968dfa3f07 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1342,12 +1342,12 @@ void SAL_CALL ScAccessibleDocumentPagePreview::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); - tools::Long nRet = 0; + sal_Int64 nRet = 0; if ( mpViewShell ) { ScPagePreviewCountData aCount( mpViewShell->GetLocationData(), mpViewShell->GetWindow(), GetNotesChildren(), GetShapeChildren() ); @@ -1357,7 +1357,7 @@ sal_Int32 SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChildCount() return nRet; } -uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int32 nIndex) +uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1404,7 +1404,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi } else { - sal_Int32 nIdx(nIndex - (aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters)); + sal_Int64 nIdx(nIndex - (aCount.nBackShapes + aCount.nHeaders + aCount.nTables + aCount.nNoteParagraphs + aCount.nFooters)); if (nIdx < aCount.nForeShapes) xAccessible = GetShapeChildren()->GetForeShape(nIdx); else diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 5f79718dfa72..d500aa2a3a21 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -244,7 +244,7 @@ tools::Rectangle ScAccessibleEditObject::GetBoundingBox() const //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleEditObject::getAccessibleChildCount() { SolarMutexGuard aGuard; @@ -254,7 +254,7 @@ sal_Int32 SAL_CALL } uno::Reference< XAccessible > SAL_CALL - ScAccessibleEditObject::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleEditObject::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -446,11 +446,11 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor) } //===== XAccessibleSelection ============================================ -void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 ) +void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int64 ) { } -sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex ) +sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int64 nChildIndex ) { uno::Reference<XAccessible> xAcc = getAccessibleChild( nChildIndex ); uno::Reference<XAccessibleContext> xContext; @@ -479,21 +479,21 @@ void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren( ) { } -sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() { - sal_Int32 nCount = 0; - sal_Int32 TotalCount = getAccessibleChildCount(); - for( sal_Int32 i = 0; i < TotalCount; i++ ) + sal_Int64 nCount = 0; + sal_Int64 TotalCount = getAccessibleChildCount(); + for( sal_Int64 i = 0; i < TotalCount; i++ ) if( isAccessibleChildSelected(i) ) nCount++; return nCount; } -uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) +uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { - if ( nSelectedChildIndex > getSelectedAccessibleChildCount() ) + if ( nSelectedChildIndex < 0 || nSelectedChildIndex > getSelectedAccessibleChildCount() ) throw IndexOutOfBoundsException(); - sal_Int32 i1, i2; - for( i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) + + for (sal_Int64 i1 = 0, i2 = 0; i1 < getAccessibleChildCount(); i1++ ) if( isAccessibleChildSelected(i1) ) { if( i2 == nSelectedChildIndex ) @@ -503,8 +503,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessib return uno::Reference<XAccessible>(); } -void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild( - sal_Int32 ) +void SAL_CALL ScAccessibleEditObject::deselectAccessibleChild(sal_Int64) { } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index eae58f644666..7e7b1b5f50b5 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -149,7 +149,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleAtPo SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nCount(getAccessibleChildCount()); // fill the areas + sal_Int64 nCount(getAccessibleChildCount()); // fill the areas if (nCount) { @@ -182,7 +182,7 @@ void SAL_CALL ScAccessiblePageHeader::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -212,7 +212,7 @@ sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleChildCount() return mnChildCount; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int32 nIndex ) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -243,7 +243,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeader::getAccessibleChil return xRet; } -sal_Int32 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessiblePageHeader::getAccessibleIndexInParent() { return mnIndex; } diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 87c948108fce..df019683a708 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -118,7 +118,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessiblePageHeaderArea::getAccessibleChildCount() { SolarMutexGuard aGuard; @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL } uno::Reference< XAccessible > SAL_CALL - ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int32 nIndex) + ScAccessiblePageHeaderArea::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index 60051d21ac79..e36b1c78875f 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -120,7 +120,7 @@ void SAL_CALL ScAccessiblePreviewCell::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -129,7 +129,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewCell::getAccessibleChildCount() return mpTextHelper->GetChildCount(); } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int32 nIndex) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewCell::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index 3213806d395e..c7b767d0eb0b 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -205,7 +205,7 @@ void SAL_CALL ScAccessiblePreviewHeaderCell::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -214,7 +214,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChildCount() return mxTextHelper->GetChildCount(); } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int32 nIndex) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -223,7 +223,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewHeaderCell::getAccessi return mxTextHelper->GetChild(nIndex); } -sal_Int32 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessiblePreviewHeaderCell::getAccessibleIndexInParent() { return mnIndex; } diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index e30d1ce9e7ac..feaabfa820d1 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -345,7 +345,7 @@ sal_Bool SAL_CALL ScAccessiblePreviewTable::isAccessibleSelected( sal_Int32 nRow return false; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -356,11 +356,11 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndex( sal_Int32 nRow, throw lang::IndexOutOfBoundsException(); // index iterates horizontally - sal_Int32 nRet = nRow * mpTableInfo->GetCols() + nColumn; + sal_Int64 nRet = static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(mpTableInfo->GetCols()) + nColumn; return nRet; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -374,7 +374,7 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleRow( sal_Int32 nChildI return nRow; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -452,7 +452,7 @@ void SAL_CALL ScAccessiblePreviewTable::grabFocus() //===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -461,11 +461,11 @@ sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleChildCount() tools::Long nRet = 0; if ( mpTableInfo ) - nRet = static_cast<sal_Int32>(mpTableInfo->GetCols()) * mpTableInfo->GetRows(); + nRet = static_cast<sal_Int64>(mpTableInfo->GetCols()) * mpTableInfo->GetRows(); return nRet; } -uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int32 nIndex ) +uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleChild( sal_Int64 nIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -480,8 +480,8 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh { // nCol, nRow are within the visible table, not the document sal_Int32 nCol = nIndex % nColumns; - sal_Int32 nRow = nIndex / nColumns; - + sal_Int64 nRow = nIndex / nColumns; + assert(nRow <= std::numeric_limits<sal_Int32>::max()); xRet = getAccessibleCellAt( nRow, nCol ); } } @@ -492,7 +492,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePreviewTable::getAccessibleCh return xRet; } -sal_Int32 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() +sal_Int64 SAL_CALL ScAccessiblePreviewTable::getAccessibleIndexInParent() { return mnIndex; } diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index fbf3a408a51f..23f017e5675c 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1063,7 +1063,7 @@ sal_Int64 SAL_CALL ScAccessibleSpreadsheet::getAccessibleStateSet() ///===== XAccessibleSelection =========================================== -void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ScAccessibleSpreadsheet::selectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1108,17 +1108,17 @@ void SAL_CALL ScAccessibleSpreadsheet::selectAllAccessibleChildren( ) mpViewShell->SelectAll(); } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleSpreadsheet::getSelectedAccessibleChildCount( ) { SolarMutexGuard aGuard; IsObjectValid(); - sal_Int32 nResult(0); + sal_Int64 nResult(0); if (mpViewShell) { if (IsFormulaMode()) { - nResult = GetRowAll() * GetColAll() ; + nResult = static_cast<sal_Int64>(GetRowAll()) * static_cast<sal_Int64>(GetColAll()); } else { @@ -1137,7 +1137,7 @@ sal_Int32 SAL_CALL } uno::Reference<XAccessible > SAL_CALL - ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + ScAccessibleSpreadsheet::getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1175,7 +1175,7 @@ uno::Reference<XAccessible > SAL_CALL return xAccessible; } -void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int32 nChildIndex ) +void SAL_CALL ScAccessibleSpreadsheet::deselectAccessibleChild( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -1598,13 +1598,13 @@ bool ScAccessibleSpreadsheet::IsScAddrFormulaSel(const ScAddress &addr) const addr.Tab() == mpViewShell->GetViewData().GetTabNo(); } -bool ScAccessibleSpreadsheet::CheckChildIndex(sal_Int32 nIndex) const +bool ScAccessibleSpreadsheet::CheckChildIndex(sal_Int64 nIndex) const { - sal_Int32 nMaxIndex = (m_nMaxX - m_nMinX +1)*(m_nMaxY - m_nMinY +1) -1 ; + sal_Int64 nMaxIndex = static_cast<sal_Int64>(m_nMaxX - m_nMinX +1) * static_cast<sal_Int64>(m_nMaxY - m_nMinY +1) -1 ; return nIndex <= nMaxIndex && nIndex >= 0 ; } -ScAddress ScAccessibleSpreadsheet::GetChildIndexAddress(sal_Int32 nIndex) const +ScAddress ScAccessibleSpreadsheet::GetChildIndexAddress(sal_Int64 nIndex) const { sal_Int32 nRowAll = GetRowAll(); sal_uInt16 nColAll = GetColAll(); @@ -1619,7 +1619,7 @@ ScAddress ScAccessibleSpreadsheet::GetChildIndexAddress(sal_Int32 nIndex) const ); } -sal_Int32 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ) { sal_uInt16 nColRelative = sal_uInt16(nColumn) - GetColAll(); sal_Int32 nRowRelative = nRow - GetRowAll(); @@ -1627,7 +1627,7 @@ sal_Int32 ScAccessibleSpreadsheet::GetAccessibleIndexFormula( sal_Int32 nRow, sa { return -1; } - return GetRowAll() * nRowRelative + nColRelative; + return static_cast<sal_Int64>(GetRowAll()) * static_cast<sal_Int64>(nRowRelative) + nColRelative; } bool ScAccessibleSpreadsheet::IsFormulaMode() diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 3b1d8fee750c..5ce54fad56df 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -263,7 +263,7 @@ sal_Bool SAL_CALL ScAccessibleTableBase::isAccessibleSelected( sal_Int32 /* nRow // ===== XAccessibleExtendedTable ======================================== -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) +sal_Int64 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -276,10 +276,10 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleIndex( sal_Int32 nRow, sa nRow -= maRange.aStart.Row(); nColumn -= maRange.aStart.Col(); - return (nRow * (maRange.aEnd.Col() + 1)) + nColumn; + return (static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(maRange.aEnd.Col() + 1)) + nColumn; } -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -290,7 +290,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleRow( sal_Int32 nChildInde return nChildIndex / (maRange.aEnd.Col() - maRange.aStart.Col() + 1); } -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) +sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int64 nChildIndex ) { SolarMutexGuard aGuard; IsObjectValid(); @@ -303,7 +303,7 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleColumn( sal_Int32 nChildI // ===== XAccessibleContext ============================================== -sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() +sal_Int64 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() { SolarMutexGuard aGuard; IsObjectValid(); @@ -312,15 +312,13 @@ sal_Int32 SAL_CALL ScAccessibleTableBase::getAccessibleChildCount() // this needs a radical re-think. sal_Int64 nMax = static_cast<sal_Int64>(maRange.aEnd.Row() - maRange.aStart.Row() + 1) * static_cast<sal_Int64>(maRange.aEnd.Col() - maRange.aStart.Col() + 1); - if (nMax > SAL_MAX_INT32) - nMax = SAL_MAX_INT32; if (nMax < 0) return 0; - return static_cast<sal_Int32>(nMax); + return nMax; } uno::Reference< XAccessible > SAL_CALL - ScAccessibleTableBase::getAccessibleChild(sal_Int32 nIndex) + ScAccessibleTableBase::getAccessibleChild(sal_Int64 nIndex) { SolarMutexGuard aGuard; IsObjectValid(); @@ -369,12 +367,12 @@ sal_Int64 SAL_CALL ScAccessibleTableBase::getAccessibleStateSet() ///===== XAccessibleSelection =========================================== -void SAL_CALL ScAccessibleTableBase::selectAccessibleChild( sal_Int32 /* nChildIndex */ ) +void SAL_CALL ScAccessibleTableBase::selectAccessibleChild( sal_Int64 /* nChildIndex */ ) { } sal_Bool SAL_CALL - ScAccessibleTableBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) + ScAccessibleTableBase::isAccessibleChildSelected( sal_Int64 nChildIndex ) { // I don't need to guard, because the called functions have a guard if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount()) @@ -391,20 +389,20 @@ void SAL_CALL ScAccessibleTableBase::selectAllAccessibleChildren() { } -sal_Int32 SAL_CALL +sal_Int64 SAL_CALL ScAccessibleTableBase::getSelectedAccessibleChildCount( ) { return 0; } uno::Reference<XAccessible > SAL_CALL - ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) + ScAccessibleTableBase::getSelectedAccessibleChild( sal_Int64 /* nSelectedChildIndex */ ) { uno::Reference < XAccessible > xAccessible; return xAccessible; } -void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSelectedChildIndex */ ) +void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int64 /* nSelectedChildIndex */ ) { } diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index d86d1eddad50..87c754992856 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -50,7 +50,7 @@ public: const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc); @@ -59,7 +59,7 @@ private: const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScTabViewShell* pViewShell, const ScAddress& rCellAddress, - sal_Int32 nIndex, + sal_Int64 nIndex, ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc); @@ -101,13 +101,13 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; /// Return the set of current states. virtual sal_Int64 SAL_CALL diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 6ba0bade835b..f756faf4821f 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -37,7 +37,7 @@ public: const css::uno::Reference<css::accessibility::XAccessible>& rxParent, ScDocument* pDoc, const ScAddress& rCellAddress, - sal_Int32 nIndex); + sal_Int64 nIndex); protected: virtual ~ScAccessibleCellBase() override; public: @@ -62,7 +62,7 @@ public: ///===== XAccessibleContext ============================================== /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; protected: @@ -115,7 +115,7 @@ protected: ScDocument* mpDoc; - sal_Int32 mnIndex; + sal_Int64 mnIndex; private: virtual bool IsEditable(sal_Int64 nParentStates); diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 879de23a7442..8fa51ea52382 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -120,18 +120,18 @@ public: ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; /// Return a reference to the parent. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() override; /// Return this objects index among the parents children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /// Return this object's role. diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 576389f1d73e..6dfc22433880 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -111,10 +111,10 @@ public: // XAccessibleContext ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Throws an exception (the ruler does not have children). */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; virtual sal_Int16 SAL_CALL getAccessibleRole( ) override { return css::accessibility::AccessibleRole::TEXT; } @@ -232,7 +232,7 @@ typedef ::cppu::ImplHelper3< class ScAccessibleCsvGrid : public ScAccessibleCsvControl, public ScAccessibleCsvGridImpl { protected: - typedef std::map< sal_Int32, rtl::Reference<ScAccessibleCsvCell> > XAccessibleSet; + typedef std::map< sal_Int64, rtl::Reference<ScAccessibleCsvCell> > XAccessibleSet; private: XAccessibleSet maAccessibleChildren; @@ -262,10 +262,10 @@ public: // XAccessibleContext ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Returns the specified child cell. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; /** Returns the relation to the ruler control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; @@ -326,21 +326,21 @@ public: virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the child index of the cell at the specified position. */ - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** Returns the row index of the specified child. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; /** Returns the column index of the specified child. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override; /** Returns true, if the specified child is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) override; /** Deselects all cells. */ virtual void SAL_CALL clearAccessibleSelection() override; @@ -349,13 +349,13 @@ public: virtual void SAL_CALL selectAllAccessibleChildren() override; /** Returns the count of selected children. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount() override; /** Returns the child with the specified index in all selected children. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; /** Deselects the child with the specified index in all selected children. */ - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; // XInterface ------------------------------------------------------------- @@ -388,7 +388,7 @@ public: private: /** @throws css::lang::IndexOutOfBoundsException if nIndex is not a valid child index. */ - void ensureValidIndex( sal_Int32 nIndex ) const; + void ensureValidIndex( sal_Int64 nIndex ) const; /** @Throws css::lang::IndexOutOfBoundsException if the specified position is invalid. */ void ensureValidPosition( sal_Int32 nRow, sal_Int32 nColumn ) const; @@ -407,16 +407,16 @@ private: /** Returns the count of selected columns in the table. */ sal_Int32 implGetSelColumnCount() const; /** Returns the total cell count in the table (including header). */ - sal_Int32 implGetCellCount() const { return implGetRowCount() * implGetColumnCount(); } + sal_Int64 implGetCellCount() const { return static_cast<sal_Int64>(implGetRowCount()) * static_cast<sal_Int64>(implGetColumnCount()); } /** Returns the row index from cell index (including header). */ - sal_Int32 implGetRow( sal_Int32 nIndex ) const { return nIndex / implGetColumnCount(); } + sal_Int32 implGetRow( sal_Int64 nIndex ) const { return nIndex / implGetColumnCount(); } /** Returns the column index from cell index (including header). */ - sal_Int32 implGetColumn( sal_Int32 nIndex ) const { return nIndex % implGetColumnCount(); } + sal_Int32 implGetColumn( sal_Int64 nIndex ) const { return nIndex % implGetColumnCount(); } /** Returns the absolute column index of the nSelColumn-th selected column. */ sal_Int32 implGetSelColumn( sal_Int32 nSelColumn ) const; /** Returns the child index from cell position (including header). */ - sal_Int32 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return nRow * implGetColumnCount() + nColumn; } + sal_Int64 implGetIndex( sal_Int32 nRow, sal_Int32 nColumn ) const { return static_cast<sal_Int64>(nRow) * static_cast<sal_Int64>(implGetColumnCount()) + nColumn; } /** Returns the contents of the specified cell (including header). Indexes must be valid. */ OUString implGetCellText( sal_Int32 nRow, sal_Int32 nColumn ) const; @@ -469,13 +469,13 @@ public: // XAccessibleContext ----------------------------------------------------- /** Returns the child count. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /** Returns the specified child. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 nIndex ) override; /** Returns the index of this cell in the table. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; /** Returns the relation to the ruler control. */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 35ae8666969c..95122e789b87 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -98,12 +98,12 @@ public: ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; /// Return the set of current states. virtual sal_Int64 SAL_CALL @@ -116,10 +116,10 @@ public: ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) override; + selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + isAccessibleChildSelected( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -127,15 +127,15 @@ public: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) override; + deselectAccessibleChild( sal_Int64 nChildIndex ) override; ///===== XSelectionListener ============================================= diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index fc595fd86bd5..c129a8879efc 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -64,11 +64,11 @@ public: ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; /// Return the set of current states. virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index b8f64099f63f..b76ebe936eb0 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -104,13 +104,13 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; /// Return the set of current states. virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; @@ -118,16 +118,16 @@ public: //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL isAccessibleChildSelected( - sal_Int32 nChildIndex ) override; + sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( - sal_Int32 nSelectedChildIndex ) override; + sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL deselectAccessibleChild( - sal_Int32 nSelectedChildIndex ) override; + sal_Int64 nSelectedChildIndex ) override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; protected: /// Return this object's description. diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index cfd0803f1bf1..ff8cd8ffe1a5 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -54,10 +54,10 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + getAccessibleChild( sal_Int64 i ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; //===== XServiceInfo ==================================================== diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index d51580d852e5..de4ac2dcea24 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -61,13 +61,13 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; /// Return the set of current states. virtual sal_Int64 SAL_CALL diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index bd120f930dfc..7dbe4d1e03b4 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -58,9 +58,9 @@ public: //===== XAccessibleContext ============================================== // override to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; + getAccessibleChild( sal_Int64 i ) override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index e39f05ccc543..64d3670b78cf 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -82,10 +82,10 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + getAccessibleChild( sal_Int64 i ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; //===== XServiceInfo ==================================================== diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index e93ed6bc6945..bd4ba93e689b 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -82,9 +82,9 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary() override; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) override; //===== XAccessibleComponent ============================================ @@ -94,10 +94,10 @@ public: //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + getAccessibleChild( sal_Int64 i ) override; + virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override; virtual sal_Int64 SAL_CALL getAccessibleStateSet() override; //===== XServiceInfo ==================================================== diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 2273c9ded344..78e735942270 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -161,7 +161,7 @@ private: ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) override; + selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -169,14 +169,14 @@ private: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nChildIndex ) override; + deselectAccessibleChild( sal_Int64 nChildIndex ) override; ///===== XServiceInfo ==================================================== @@ -235,9 +235,9 @@ private: sal_uInt16 GetColAll() const { return m_nMaxX - m_nMinX + 1; } void NotifyRefMode(); void RemoveFormulaSelection(bool bRemoveAll = false); - bool CheckChildIndex(sal_Int32) const; - ScAddress GetChildIndexAddress(sal_Int32) const; - sal_Int32 GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ); + bool CheckChildIndex(sal_Int64) const; + ScAddress GetChildIndexAddress(sal_Int64) const; + sal_Int64 GetAccessibleIndexFormula( sal_Int32 nRow, sal_Int32 nColumn ); bool GetFormulaCurrentFocusCell(ScAddress &addr); ScTabViewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 0a9514bffc7f..6fac6ce5376a 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -135,28 +135,28 @@ public: ///===== XAccessibleExtendedTable ======================================== /// Returns the index of the cell on the given position. - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL - getAccessibleRow( sal_Int32 nChildIndex ) override; + getAccessibleRow( sal_Int64 nChildIndex ) override; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL - getAccessibleColumn( sal_Int32 nChildIndex ) override; + getAccessibleColumn( sal_Int64 nChildIndex ) override; //===== XAccessibleContext ============================================== /// Return the number of currently visible children. /// override to calculate this on demand - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getAccessibleChildCount() override; /// Return the specified child or NULL if index is invalid. /// override to calculate this on demand virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild(sal_Int32 nIndex) override; + getAccessibleChild(sal_Int64 nIndex) override; virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) override; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override; @@ -184,10 +184,10 @@ public: ///===== XAccessibleSelection =========================================== virtual void SAL_CALL - selectAccessibleChild( sal_Int32 nChildIndex ) override; + selectAccessibleChild( sal_Int64 nChildIndex ) override; virtual sal_Bool SAL_CALL - isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + isAccessibleChildSelected( sal_Int64 nChildIndex ) override; virtual void SAL_CALL clearAccessibleSelection( ) override; @@ -195,14 +195,14 @@ public: virtual void SAL_CALL selectAllAccessibleChildren( ) override; - virtual sal_Int32 SAL_CALL + virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount( ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override; virtual void SAL_CALL - deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) override; ///===== XServiceInfo =================================================== |