accessibility/inc/extended/AccessibleBrowseBox.hxx                  |    6 
 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx              |    2 
 accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx      |    6 
 accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx         |   17 +-
 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx        |    6 
 accessibility/inc/extended/AccessibleBrowseBoxTable.hxx             |    4 
 accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx         |   16 +-
 accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx         |    6 
 accessibility/inc/extended/AccessibleGridControl.hxx                |    8 -
 accessibility/inc/extended/AccessibleGridControlBase.hxx            |    2 
 accessibility/inc/extended/AccessibleGridControlHeader.hxx          |    4 
 accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx      |    6 
 accessibility/inc/extended/AccessibleGridControlTable.hxx           |   14 -
 accessibility/inc/extended/AccessibleGridControlTableBase.hxx       |   14 -
 accessibility/inc/extended/AccessibleGridControlTableCell.hxx       |    6 
 accessibility/inc/extended/accessibleeditbrowseboxcell.hxx          |    4 
 accessibility/inc/extended/accessibleiconchoicectrl.hxx             |   14 -
 accessibility/inc/extended/accessibleiconchoicectrlentry.hxx        |    6 
 accessibility/inc/extended/accessiblelistbox.hxx                    |   14 -
 accessibility/inc/extended/accessiblelistboxentry.hxx               |   16 +-
 accessibility/inc/extended/accessibletabbar.hxx                     |    6 
 accessibility/inc/extended/accessibletabbarpage.hxx                 |    6 
 accessibility/inc/extended/accessibletabbarpagelist.hxx             |   16 +-
 accessibility/inc/extended/accessibletablistbox.hxx                 |    4 
 accessibility/inc/extended/accessibletablistboxtable.hxx            |   14 -
 accessibility/inc/extended/textwindowaccessibility.hxx              |   10 -
 accessibility/inc/standard/accessiblemenubasecomponent.hxx          |    4 
 accessibility/inc/standard/accessiblemenucomponent.hxx              |   14 -
 accessibility/inc/standard/accessiblemenuitemcomponent.hxx          |    6 
 accessibility/inc/standard/vclxaccessiblebox.hxx                    |    6 
 accessibility/inc/standard/vclxaccessibleedit.hxx                   |    4 
 accessibility/inc/standard/vclxaccessibleheaderbar.hxx              |    4 
 accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx          |    6 
 accessibility/inc/standard/vclxaccessiblelist.hxx                   |   18 +-
 accessibility/inc/standard/vclxaccessiblelistitem.hxx               |    6 
 accessibility/inc/standard/vclxaccessiblemenu.hxx                   |   16 +-
 accessibility/inc/standard/vclxaccessiblemenubar.hxx                |    2 
 accessibility/inc/standard/vclxaccessiblepopupmenu.hxx              |    2 
 accessibility/inc/standard/vclxaccessiblestatusbar.hxx              |    4 
 accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx          |    6 
 accessibility/inc/standard/vclxaccessibletabcontrol.hxx             |   16 +-
 accessibility/inc/standard/vclxaccessibletabpage.hxx                |    8 -
 accessibility/inc/standard/vclxaccessibletabpagewindow.hxx          |    2 
 accessibility/inc/standard/vclxaccessibletextfield.hxx              |    4 
 accessibility/inc/standard/vclxaccessibletoolbox.hxx                |   16 +-
 accessibility/inc/standard/vclxaccessibletoolboxitem.hxx            |    6 
 accessibility/source/extended/AccessibleBrowseBox.cxx               |    9 -
 accessibility/source/extended/AccessibleBrowseBoxBase.cxx           |    8 -
 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx   |    8 -
 accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx      |   21 +-
 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx     |    8 -
 accessibility/source/extended/AccessibleBrowseBoxTable.cxx          |    4 
 accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx      |   20 +-
 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx      |    8 -
 accessibility/source/extended/AccessibleGridControl.cxx             |   12 -
 accessibility/source/extended/AccessibleGridControlBase.cxx         |    8 -
 accessibility/source/extended/AccessibleGridControlHeader.cxx       |    4 
 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx   |    9 -
 accessibility/source/extended/AccessibleGridControlTable.cxx        |   21 +-
 accessibility/source/extended/AccessibleGridControlTableBase.cxx    |   22 +-
 accessibility/source/extended/AccessibleGridControlTableCell.cxx    |   12 -
 accessibility/source/extended/accessibleeditbrowseboxcell.cxx       |    4 
 accessibility/source/extended/accessibleiconchoicectrl.cxx          |   25 ++-
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx     |    6 
 accessibility/source/extended/accessiblelistbox.cxx                 |   19 +-
 accessibility/source/extended/accessiblelistboxentry.cxx            |   37 
+++--
 accessibility/source/extended/accessibletabbar.cxx                  |    8 -
 accessibility/source/extended/accessibletabbarpage.cxx              |    8 -
 accessibility/source/extended/accessibletabbarpagelist.cxx          |   20 +-
 accessibility/source/extended/accessibletablistbox.cxx              |    4 
 accessibility/source/extended/accessibletablistboxtable.cxx         |   16 +-
 accessibility/source/extended/textwindowaccessibility.cxx           |   16 +-
 accessibility/source/standard/accessiblemenubasecomponent.cxx       |    6 
 accessibility/source/standard/accessiblemenucomponent.cxx           |   20 +-
 accessibility/source/standard/accessiblemenuitemcomponent.cxx       |    6 
 accessibility/source/standard/vclxaccessiblebox.cxx                 |   10 -
 accessibility/source/standard/vclxaccessibleedit.cxx                |    4 
 accessibility/source/standard/vclxaccessibleheaderbar.cxx           |    6 
 accessibility/source/standard/vclxaccessibleheaderbaritem.cxx       |    6 
 accessibility/source/standard/vclxaccessiblelist.cxx                |   22 +-
 accessibility/source/standard/vclxaccessiblelistitem.cxx            |    6 
 accessibility/source/standard/vclxaccessiblemenu.cxx                |   22 +-
 accessibility/source/standard/vclxaccessiblemenubar.cxx             |    4 
 accessibility/source/standard/vclxaccessiblepopupmenu.cxx           |    2 
 accessibility/source/standard/vclxaccessiblestatusbar.cxx           |    6 
 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx       |    8 -
 accessibility/source/standard/vclxaccessibletabcontrol.cxx          |   18 +-
 accessibility/source/standard/vclxaccessibletabpage.cxx             |   14 -
 accessibility/source/standard/vclxaccessibletabpagewindow.cxx       |    2 
 accessibility/source/standard/vclxaccessibletextfield.cxx           |    4 
 accessibility/source/standard/vclxaccessibletoolbox.cxx             |   40 
++---
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx         |    6 
 basctl/source/accessibility/accessibledialogcontrolshape.cxx        |   10 -
 basctl/source/accessibility/accessibledialogwindow.cxx              |   24 +--
 basctl/source/inc/accessibledialogcontrolshape.hxx                  |    6 
 basctl/source/inc/accessibledialogwindow.hxx                        |   16 +-
 chart2/source/controller/accessibility/AccessibleBase.cxx           |   10 -
 chart2/source/controller/accessibility/AccessibleChartElement.cxx   |    4 
 chart2/source/controller/accessibility/AccessibleChartElement.hxx   |    4 
 chart2/source/controller/accessibility/AccessibleChartShape.cxx     |    6 
 chart2/source/controller/accessibility/AccessibleChartShape.hxx     |    4 
 chart2/source/controller/accessibility/AccessibleChartView.cxx      |    2 
 chart2/source/controller/accessibility/AccessibleTextHelper.cxx     |    6 
 chart2/source/controller/inc/AccessibleBase.hxx                     |   10 -
 chart2/source/controller/inc/AccessibleChartView.hxx                |    2 
 chart2/source/controller/inc/AccessibleTextHelper.hxx               |    6 
 comphelper/source/misc/accessiblecontexthelper.cxx                  |    8 -
 comphelper/source/misc/accessibleselectionhelper.cxx                |   26 +--
 comphelper/source/misc/accessiblewrapper.cxx                        |   10 -
 dbaccess/qa/complex/dbaccess/CopyTableWizard.java                   |    2 
 dbaccess/source/ui/inc/ConnectionLineAccess.hxx                     |    6 
 dbaccess/source/ui/inc/JAccess.hxx                                  |    4 
 dbaccess/source/ui/inc/TableWindowAccess.hxx                        |    8 -
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx             |    8 -
 dbaccess/source/ui/querydesign/JAccess.cxx                          |    6 
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx                |   12 -
 editeng/source/accessibility/AccessibleContextBase.cxx              |   10 -
 editeng/source/accessibility/AccessibleEditableTextPara.cxx         |    6 
 editeng/source/accessibility/AccessibleImageBullet.cxx              |    6 
 editeng/source/accessibility/AccessibleImageBullet.hxx              |    6 
 editeng/source/accessibility/AccessibleSelectionBase.cxx            |   10 -
 editeng/source/accessibility/AccessibleStaticTextBase.cxx           |    4 
 include/comphelper/accessiblecontexthelper.hxx                      |    6 
 include/comphelper/accessibleselectionhelper.hxx                    |   24 +--
 include/comphelper/accessiblewrapper.hxx                            |   10 -
 include/editeng/AccessibleContextBase.hxx                           |    6 
 include/editeng/AccessibleEditableTextPara.hxx                      |    6 
 include/editeng/AccessibleSelectionBase.hxx                         |   10 -
 include/editeng/AccessibleStaticTextBase.hxx                        |    4 
 include/svx/AccessibleControlShape.hxx                              |    4 
 include/svx/AccessibleShape.hxx                                     |   16 +-
 include/svx/AccessibleTextHelper.hxx                                |    4 
 include/svx/ChildrenManager.hxx                                     |    6 
 include/toolkit/awt/vclxaccessiblecomponent.hxx                     |    6 
 offapi/com/sun/star/accessibility/XAccessibleContext.idl            |    6 
 offapi/com/sun/star/accessibility/XAccessibleSelection.idl          |   10 -
 offapi/com/sun/star/accessibility/XAccessibleTable.idl              |    6 
 qadevOOo/runner/util/AccessibilityTools.java                        |   24 +--
 qadevOOo/runner/util/UITools.java                                   |    2 
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java    |    8 -
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleContext.java      |    8 -
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleSelection.java    |   44 
++---
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleTable.java        |   19 +-
 qadevOOo/tests/java/mod/_sw/SwAccessibleDocumentView.java           |    4 
 qadevOOo/tests/java/mod/_sw/SwAccessiblePageView.java               |    4 
 sc/qa/complex/calcPreview/ViewForwarder.java                        |    6 
 sc/source/ui/Accessibility/AccessibleCell.cxx                       |    8 -
 sc/source/ui/Accessibility/AccessibleCellBase.cxx                   |    4 
 sc/source/ui/Accessibility/AccessibleContextBase.cxx                |   12 -
 sc/source/ui/Accessibility/AccessibleCsvControl.cxx                 |   37 
++---
 sc/source/ui/Accessibility/AccessibleDocument.cxx                   |   26 +--
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx        |    8 -
 sc/source/ui/Accessibility/AccessibleEditObject.cxx                 |   27 +--
 sc/source/ui/Accessibility/AccessiblePageHeader.cxx                 |    8 -
 sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx             |    4 
 sc/source/ui/Accessibility/AccessiblePreviewCell.cxx                |    4 
 sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx          |    6 
 sc/source/ui/Accessibility/AccessiblePreviewTable.cxx               |   20 +-
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx                |   22 +-
 sc/source/ui/Accessibility/AccessibleTableBase.cxx                  |   26 +--
 sc/source/ui/inc/AccessibleCell.hxx                                 |    8 -
 sc/source/ui/inc/AccessibleCellBase.hxx                             |    6 
 sc/source/ui/inc/AccessibleContextBase.hxx                          |    6 
 sc/source/ui/inc/AccessibleCsvControl.hxx                           |   42 
++---
 sc/source/ui/inc/AccessibleDocument.hxx                             |   14 -
 sc/source/ui/inc/AccessibleDocumentPagePreview.hxx                  |    4 
 sc/source/ui/inc/AccessibleEditObject.hxx                           |   14 -
 sc/source/ui/inc/AccessiblePageHeader.hxx                           |    6 
 sc/source/ui/inc/AccessiblePageHeaderArea.hxx                       |    4 
 sc/source/ui/inc/AccessiblePreviewCell.hxx                          |    4 
 sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx                    |    6 
 sc/source/ui/inc/AccessiblePreviewTable.hxx                         |   12 -
 sc/source/ui/inc/AccessibleSpreadsheet.hxx                          |   14 -
 sc/source/ui/inc/AccessibleTableBase.hxx                            |   20 +-
 sd/qa/unit/a11y/layout.cxx                                          |    2 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx           |   16 +-
 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx           |   14 -
 sd/source/ui/accessibility/AccessibleOutlineView.cxx                |    4 
 sd/source/ui/accessibility/AccessiblePageShape.cxx                  |    4 
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx          |   12 -
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx            |   35 +++-
 sd/source/ui/inc/AccessibleDocumentViewBase.hxx                     |    8 -
 sd/source/ui/inc/AccessibleDrawDocumentView.hxx                     |    8 -
 sd/source/ui/inc/AccessibleOutlineView.hxx                          |    4 
 sd/source/ui/inc/AccessiblePageShape.hxx                            |    4 
 sd/source/ui/inc/AccessibleSlideSorterObject.hxx                    |    6 
 sd/source/ui/inc/AccessibleSlideSorterView.hxx                      |   16 +-
 sdext/source/presenter/PresenterAccessibility.cxx                   |   18 +-
 sfx2/source/control/thumbnailviewacc.cxx                            |   51 
++++--
 sfx2/source/control/thumbnailviewacc.hxx                            |   22 +-
 starmath/source/accessibility.cxx                                   |   12 -
 starmath/source/accessibility.hxx                                   |    6 
 svtools/source/control/accessibleruler.cxx                          |   10 -
 svtools/source/control/accessibleruler.hxx                          |    6 
 svtools/source/control/valueacc.cxx                                 |   52 
++++---
 svtools/source/control/valueimp.hxx                                 |   22 +-
 svx/inc/AccessibleTableShape.hxx                                    |   36 ++--
 svx/source/accessibility/AccessibleControlShape.cxx                 |    8 -
 svx/source/accessibility/AccessibleFrameSelector.cxx                |   14 +
 svx/source/accessibility/AccessibleShape.cxx                        |   35 ++--
 svx/source/accessibility/AccessibleTextHelper.cxx                   |   16 +-
 svx/source/accessibility/ChildrenManager.cxx                        |    6 
 svx/source/accessibility/ChildrenManagerImpl.cxx                    |   10 -
 svx/source/accessibility/ChildrenManagerImpl.hxx                    |    6 
 svx/source/accessibility/GraphCtlAccessibleContext.cxx              |   32 ++--
 svx/source/accessibility/charmapacc.cxx                             |   26 ++-
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx           |   12 -
 svx/source/accessibility/svxrectctaccessiblecontext.cxx             |   14 -
 svx/source/dialog/weldeditview.cxx                                  |   12 -
 svx/source/inc/AccessibleFrameSelector.hxx                          |    8 -
 svx/source/inc/GraphCtlAccessibleContext.hxx                        |   20 +-
 svx/source/inc/charmapacc.hxx                                       |   18 +-
 svx/source/inc/svxpixelctlaccessiblecontext.hxx                     |   12 -
 svx/source/inc/svxrectctaccessiblecontext.hxx                       |   14 -
 svx/source/table/accessiblecell.cxx                                 |   10 -
 svx/source/table/accessiblecell.hxx                                 |    6 
 svx/source/table/accessibletableshape.cxx                           |   74 
+++++-----
 sw/source/core/access/acccell.cxx                                   |   10 -
 sw/source/core/access/acccell.hxx                                   |   10 -
 sw/source/core/access/acccontext.cxx                                |   11 -
 sw/source/core/access/acccontext.hxx                                |    6 
 sw/source/core/access/accdoc.cxx                                    |   22 +-
 sw/source/core/access/accdoc.hxx                                    |   16 +-
 sw/source/core/access/accmap.cxx                                    |    4 
 sw/source/core/access/accpara.cxx                                   |   10 -
 sw/source/core/access/accpara.hxx                                   |   10 -
 sw/source/core/access/accselectionhelper.cxx                        |   18 +-
 sw/source/core/access/accselectionhelper.hxx                        |   10 -
 sw/source/core/access/acctable.cxx                                  |   56 
+++----
 sw/source/core/access/acctable.hxx                                  |   26 +--
 sw/source/core/access/acctextframe.cxx                              |   24 +--
 sw/source/core/access/acctextframe.hxx                              |   10 -
 sw/source/uibase/docvw/SidebarWinAcc.cxx                            |    4 
 test/source/a11y/AccessibilityTools.cxx                             |    4 
 test/source/a11y/accessibletestbase.cxx                             |    4 
 toolkit/inc/controls/accessiblecontrolcontext.hxx                   |    4 
 toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java             |    4 
 toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java |    8 -
 toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java   |    8 -
 toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx              |    4 
 toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx                |   10 -
 toolkit/source/awt/vclxaccessiblecomponent.cxx                      |   16 +-
 toolkit/source/controls/accessiblecontrolcontext.cxx                |    4 
 toolkit/test/accessibility/AccessibleCellHandler.java               |   14 -
 toolkit/test/accessibility/AccessibleSelectionHandler.java          |    6 
 toolkit/test/accessibility/AccessibleTreeHandler.java               |    2 
 vcl/osx/a11yselectionwrapper.mm                                     |    4 
 vcl/osx/a11ytablewrapper.mm                                         |    4 
 vcl/osx/a11ywrapper.mm                                              |   10 -
 vcl/osx/documentfocuslistener.cxx                                   |    4 
 vcl/qt5/QtAccessibleWidget.cxx                                      |   48 
+++++-
 vcl/source/window/accessibility.cxx                                 |    4 
 vcl/unx/gtk3/a11y/atklistener.cxx                                   |    7 
 vcl/unx/gtk3/a11y/atkselection.cxx                                  |   14 +
 vcl/unx/gtk3/a11y/atktable.cxx                                      |   15 +-
 vcl/unx/gtk3/a11y/atkutil.cxx                                       |    5 
 vcl/unx/gtk3/a11y/atkwrapper.cxx                                    |   21 ++
 winaccessibility/source/UAccCOM/AccTable.cxx                        |   72 
+++++++--
 winaccessibility/source/UAccCOM/AccTableCell.h                      |    2 
 winaccessibility/source/UAccCOM/EnumVariant.cxx                     |   46 
++++--
 winaccessibility/source/UAccCOM/EnumVariant.h                       |    4 
 winaccessibility/source/UAccCOM/MAccessible.cxx                     |   54 
+++++--
 winaccessibility/source/service/AccContainerEventListener.cxx       |    4 
 winaccessibility/source/service/AccObjectWinManager.cxx             |    8 -
 winaccessibility/source/service/AccTopWindowListener.cxx            |    5 
 winaccessibility/source/service/msaaservice_impl.cxx                |    4 
 266 files changed, 1706 insertions(+), 1468 deletions(-)

New commits:
commit 206543c7bef58fc559852553a3b2faba0b604259
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Sep 2 13:06:08 2022 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Sep 2 15:47:37 2022 +0200

    [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.wegh...@posteo.de>

diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx 
b/accessibility/inc/extended/AccessibleBrowseBox.hxx
index ba00e00d6c91..82211f1aec32 100644
--- a/accessibility/inc/extended/AccessibleBrowseBox.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx
@@ -62,12 +62,12 @@ protected:
     // XAccessibleContext
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference<
         css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     // XAccessibleComponent
 
@@ -166,7 +166,7 @@ protected:
         @return  The XAccessible interface of the specified child. */
     css::uno::Reference<
         css::accessibility::XAccessible >
-    implGetFixedChild( sal_Int32 nChildIndex );
+    implGetFixedChild( sal_Int64 nChildIndex );
 
     /** This method creates and returns an accessible table.
         @return  An AccessibleBrowseBoxTable. */
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index b10cb4d7bc7e..d8bcd169ac2e 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -108,7 +108,7 @@ public:
     virtual css::uno::Reference<css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent() override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     /** @return
             The description of this object.
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index cb2a771100ae..dbc2fbd52aaf 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -59,10 +59,10 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual OUString SAL_CALL getImplementationName() override;
-        virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
 
 
         // XAccessibleValue
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
index 64d41cb6d2d9..c8f2e8b835c4 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx
@@ -59,11 +59,10 @@ public:
         The XAccessible interface of the specified child.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL
-    getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
@@ -116,10 +115,10 @@ public:
     // XAccessibleSelection
 
     /** Selects the specified child (row or column of the table). */
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
 
     /** @return  TRUE, if the specified child (row/column) is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
 
     /** Clears the complete selection. */
     virtual void SAL_CALL clearAccessibleSelection() override;
@@ -128,14 +127,14 @@ public:
     virtual void SAL_CALL selectAllAccessibleChildren() override;
 
     /** @return  The number of selected rows/columns. */
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount() override;
 
     /** @return  The specified selected row/column. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
 
     /** Removes the specified row/column from the selection. */
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 
nSelectedChildIndex ) override;
 
     // XInterface
 
@@ -191,7 +190,7 @@ private:
         @return  The absolute child index from the index of selected children.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified index is invalid. */
-    sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 
nSelectedChildIndex );
+    sal_Int64 implGetChildIndexFromSelectedIndex( sal_Int64 
nSelectedChildIndex );
 
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index 61e667d594c4..a3062a12ea89 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -32,14 +32,14 @@ namespace accessibility
                                           const css::uno::Reference< 
css::awt::XWindow >& _xFocusWindow,
                                           AccessibleBrowseBoxObjType  
_eObjType);
         /** @return  The count of visible children. */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
         /** @return  The XAccessible interface of the specified child. */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex ) override;
+            getAccessibleChild( sal_Int64 nChildIndex ) override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
         /** Grabs the focus to the BrowseBox. */
         virtual void SAL_CALL grabFocus() override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
index 78c5cc4a9a3d..3f8d3a274c5b 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx
@@ -44,10 +44,10 @@ public:
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
index b482ab0d8b4f..422aa177ad48 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx
@@ -59,7 +59,7 @@ public:
     // XAccessibleContext
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The role of this object (a table). */
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
@@ -101,13 +101,13 @@ public:
     getAccessibleSummary() override;
 
     /** @return  The child index of the specified cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 
nColumn ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 
nColumn ) override;
 
     /** @return  The row index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) 
override;
 
     /** @return  The column index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) 
override;
 
     /*  Derived classes have to implement:
         -   getAccessibleRowDescription,
@@ -170,14 +170,14 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The number of cells of the table. */
-    sal_Int32 implGetChildCount() const;
+    sal_Int64 implGetChildCount() const;
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The row index of the specified cell index. */
-    sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
+    sal_Int32 implGetRow( sal_Int64 nChildIndex ) const;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The column index of the specified cell index. */
-    sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
+    sal_Int32 implGetColumn( sal_Int64 nChildIndex ) const;
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  TRUE, if the specified row is selected. */
@@ -228,7 +228,7 @@ protected:
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified child index is invalid. */
-    void ensureIsValidIndex( sal_Int32 nChildIndex );
+    void ensureIsValidIndex( sal_Int64 nChildIndex );
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index 09ee9c62d26b..166b7f38035b 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -66,7 +66,7 @@ namespace accessibility
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source 
) override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
         /** @return
                 The name of this class.
@@ -76,13 +76,13 @@ namespace accessibility
         /** @return
                 The count of visible children.
         */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
         /** @return
                 The XAccessible interface of the specified child.
         */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex ) override;
+            getAccessibleChild( sal_Int64 nChildIndex ) override;
 
         /** Return a bitset of states of the current object.
         */
diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx 
b/accessibility/inc/extended/AccessibleGridControl.hxx
index 302f240ee65f..c58880b9a0f4 100644
--- a/accessibility/inc/extended/AccessibleGridControl.hxx
+++ b/accessibility/inc/extended/AccessibleGridControl.hxx
@@ -51,11 +51,11 @@ class AccessibleGridControl final : public 
AccessibleGridControlBase
     // XAccessibleContext -----------------------------------------------------
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     /** @return  The role of this object (a table). */
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
@@ -131,7 +131,7 @@ private:
         @attention  This method requires locked mutex's and a living object.
         @return  The XAccessible interface of the specified child. */
     css::uno::Reference< css::accessibility::XAccessible >
-        implGetFixedChild( sal_Int32 nChildIndex );
+        implGetFixedChild( sal_Int64 nChildIndex );
 
     /** This method creates and returns an accessible table.
         @return  An AccessibleGridControlTable. */
@@ -150,7 +150,7 @@ private:
     rtl::Reference<AccessibleGridControlHeader>               
m_xColumnHeaderBar;
 
     /** @return  The count of visible children. */
-    inline sal_Int32 implGetAccessibleChildCount();
+    inline sal_Int64 implGetAccessibleChildCount();
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx 
b/accessibility/inc/extended/AccessibleGridControlBase.hxx
index 6338d147d64f..ca706c977fcd 100644
--- a/accessibility/inc/extended/AccessibleGridControlBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx
@@ -79,7 +79,7 @@ public:
     getAccessibleParent() override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     /** @return
             The description of this object.
diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx 
b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
index 63cef92cebec..680b1ceced6a 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx
@@ -51,10 +51,10 @@ public:
         The XAccessible interface of the specified child.
     */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx 
b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
index 003c3bbb4468..d530a06736de 100644
--- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx
@@ -31,14 +31,14 @@ namespace accessibility
                         ::vcl::table::IAccessibleTable& _rTable,
                         ::vcl::table::AccessibleTableControlObjType  
_eObjType);
         /** @return  The count of visible children. */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
         /** @return  The XAccessible interface of the specified child. */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex ) override;
+            getAccessibleChild( sal_Int64 nChildIndex ) override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
         /** Grabs the focus to the GridControl. */
         virtual void SAL_CALL grabFocus() override;
diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx 
b/accessibility/inc/extended/AccessibleGridControlTable.hxx
index 69e3d9229694..deb6fbf6e06b 100644
--- a/accessibility/inc/extended/AccessibleGridControlTable.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx
@@ -49,10 +49,10 @@ public:
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     /** @return  The index of this object among the parent's children. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     // XAccessibleComponent
 
@@ -104,10 +104,10 @@ public:
     // XAccessibleSelection
 
     /** Selects the specified child (row or column of the table). */
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
 
     /** @return  TRUE, if the specified child (row/column) is selected. */
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
 
     /** Clears the complete selection. */
     virtual void SAL_CALL clearAccessibleSelection() override;
@@ -116,14 +116,14 @@ public:
     virtual void SAL_CALL selectAllAccessibleChildren() override;
 
     /** @return  The number of selected rows/columns. */
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount() override;
 
     /** @return  The specified selected row/column. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
+    getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
 
     /** Removes the specified row/column from the selection. */
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 
nSelectedChildIndex ) override;
      // XInterface
 
     /** Queries for a new interface. */
diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx 
b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
index 6ef2737afb87..e8cf6bfe9b92 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx
@@ -55,7 +55,7 @@ public:
     // XAccessibleContext
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The role of this object (a table). */
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
@@ -95,13 +95,13 @@ public:
     getAccessibleSummary() override;
 
     /** @return  The child index of the specified cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 
nColumn ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 
nColumn ) override;
 
     /** @return  The row index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int64 nChildIndex ) 
override;
 
     /** @return  The column index of the specified child cell. */
-    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int64 nChildIndex ) 
override;
 
     /*  Derived classes have to implement:
         -   getAccessibleRowDescription,
@@ -139,10 +139,10 @@ protected:
 
     /** @attention  This method requires locked mutex's and a living object.
         @return  The row index of the specified cell index. */
-    sal_Int32 implGetRow( sal_Int32 nChildIndex ) const;
+    sal_Int32 implGetRow( sal_Int64 nChildIndex ) const;
     /** @attention  This method requires locked mutex's and a living object.
         @return  The column index of the specified cell index. */
-    sal_Int32 implGetColumn( sal_Int32 nChildIndex ) const;
+    sal_Int32 implGetColumn( sal_Int64 nChildIndex ) const;
 
     /** Fills a sequence with sorted indexes of completely selected rows.
         @attention  This method requires locked mutex's and a living object.
@@ -164,7 +164,7 @@ protected:
     /** @attention  This method requires locked mutex's and a living object.
         @throws <type>IndexOutOfBoundsException</type>
         If the specified child index is invalid. */
-    void ensureIsValidIndex( sal_Int32 nChildIndex );
+    void ensureIsValidIndex( sal_Int64 nChildIndex );
 };
 
 
diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx 
b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
index 2d89d009153d..cbb06ebd1477 100644
--- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx
@@ -94,7 +94,7 @@ namespace accessibility
         virtual void SAL_CALL release() noexcept override;
 
         /** @return  The index of this object among the parent's children. */
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
         /** @return
                 The name of this class.
@@ -104,13 +104,13 @@ namespace accessibility
         /** @return
                 The count of visible children.
         */
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
         /** @return
                 The XAccessible interface of the specified child.
         */
         virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-            getAccessibleChild( sal_Int32 nChildIndex ) override;
+            getAccessibleChild( sal_Int64 nChildIndex ) override;
 
         /** Return a bitset of states of the current object.
         */
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx 
b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index ffb1cf5fb695..615266637b32 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -66,8 +66,8 @@ namespace accessibility
 
         sal_Int16 SAL_CALL getAccessibleRole() override;
 
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
 
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source 
) override;
 
diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx 
b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
index 9f3f64d2658f..cd27fcb7da3f 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx
@@ -75,21 +75,21 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
 
         // XAccessibleSelection
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) 
override;
+        void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) 
override;
         void SAL_CALL clearAccessibleSelection(  ) override;
         void SAL_CALL selectAllAccessibleChildren(  ) override;
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) 
override;
+        sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) 
override;
     };
 
 
diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx 
b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
index 93077f89bcf2..67724ae710b8 100644
--- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
+++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx
@@ -117,10 +117,10 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/extended/accessiblelistbox.hxx 
b/accessibility/inc/extended/accessiblelistbox.hxx
index abb09388c952..339e32f3b0b7 100644
--- a/accessibility/inc/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/extended/accessiblelistbox.hxx
@@ -91,21 +91,21 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
 
         // XAccessibleSelection
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) 
override;
+        void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) 
override;
         void SAL_CALL clearAccessibleSelection(  ) override;
         void SAL_CALL selectAllAccessibleChildren(  ) override;
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) 
override;
+        sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) 
override;
 
     private:
 
diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx 
b/accessibility/inc/extended/accessiblelistboxentry.hxx
index b065e8947c49..6ae837f4de4b 100644
--- a/accessibility/inc/extended/accessiblelistboxentry.hxx
+++ b/accessibility/inc/extended/accessiblelistboxentry.hxx
@@ -141,10 +141,10 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
@@ -194,13 +194,13 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding 
> SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
         // XAccessibleSelection
-        void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
-        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) 
override;
+        void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
+        sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) 
override;
         void SAL_CALL clearAccessibleSelection(  ) override;
         void SAL_CALL selectAllAccessibleChildren(  ) override;
-        sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-        void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) 
override;
+        sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+        css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+        void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) 
override;
 
         // XAccessibleValue
         virtual css::uno::Any SAL_CALL getCurrentValue(  ) override;
diff --git a/accessibility/inc/extended/accessibletabbar.hxx 
b/accessibility/inc/extended/accessibletabbar.hxx
index f8a9bb2b5eb9..f2795b59106e 100644
--- a/accessibility/inc/extended/accessibletabbar.hxx
+++ b/accessibility/inc/extended/accessibletabbar.hxx
@@ -71,10 +71,10 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx 
b/accessibility/inc/extended/accessibletabbarpage.hxx
index 35c0b9baf417..75f105ae72f3 100644
--- a/accessibility/inc/extended/accessibletabbarpage.hxx
+++ b/accessibility/inc/extended/accessibletabbarpage.hxx
@@ -85,10 +85,10 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx 
b/accessibility/inc/extended/accessibletabbarpagelist.hxx
index 18d964b11005..2c7bc2fced93 100644
--- a/accessibility/inc/extended/accessibletabbarpagelist.hxx
+++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx
@@ -83,10 +83,10 @@ namespace accessibility
         virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
         // XAccessibleContext
-        virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int32 i ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleChild( sal_Int64 i ) override;
         virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getAccessibleParent(  ) override;
-        virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+        virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
         virtual OUString SAL_CALL getAccessibleDescription(  ) override;
         virtual OUString SAL_CALL getAccessibleName(  ) override;
@@ -106,13 +106,13 @@ namespace accessibility
         virtual OUString SAL_CALL getToolTipText(  ) override;
 
         // XAccessibleSelection
-        virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
-        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 
nChildIndex ) override;
+        virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+        virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 
nChildIndex ) override;
         virtual void SAL_CALL clearAccessibleSelection(  ) override;
         virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-        virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) 
override;
-        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-        virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+        virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) 
override;
+        virtual css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+        virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) 
override;
     };
 
 
diff --git a/accessibility/inc/extended/accessibletablistbox.hxx 
b/accessibility/inc/extended/accessibletablistbox.hxx
index 17f30ce60fbe..3a403ab09af0 100644
--- a/accessibility/inc/extended/accessibletablistbox.hxx
+++ b/accessibility/inc/extended/accessibletablistbox.hxx
@@ -58,11 +58,11 @@ public:
     // XAccessibleContext -----------------------------------------------------
 
     /** @return  The count of visible children. */
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     /** @return  The XAccessible interface of the specified child. */
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild( sal_Int32 nChildIndex ) override;
+    getAccessibleChild( sal_Int64 nChildIndex ) override;
 
     // XAccessibleContext
     css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL 
getAccessibleContext() override;
diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx 
b/accessibility/inc/extended/accessibletablistboxtable.hxx
index 73d5660b63a7..b2f2b4277aae 100644
--- a/accessibility/inc/extended/accessibletablistboxtable.hxx
+++ b/accessibility/inc/extended/accessibletablistboxtable.hxx
@@ -45,7 +45,7 @@ private:
     // helpers ----------------------------------------------------------------
 
     /** Throws an exception, if nIndex is not a valid child index. */
-    void ensureValidIndex( sal_Int32 _nIndex ) const;
+    void ensureValidIndex( sal_Int64 _nIndex ) const;
 
     /** Selects the specified row. */
     void implSelectRow( sal_Int32 _nRow, bool _bSelect );
@@ -58,7 +58,7 @@ private:
     sal_Int32 implGetSelRowCount() const;
 
     /** Returns the row index from cell index. */
-    sal_Int32 implGetRow( sal_Int32 _nIndex ) const
+    sal_Int32 implGetRow( sal_Int64 _nIndex ) const
     {
         auto nColCount = implGetColumnCount();
         assert(nColCount != 0);
@@ -91,13 +91,13 @@ public:
     virtual OUString SAL_CALL getImplementationName() override;
 
     // XAccessibleSelection
-    void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override;
-    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) 
override;
+    void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) override;
+    sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex ) 
override;
     void SAL_CALL clearAccessibleSelection(  ) override;
     void SAL_CALL selectAllAccessibleChildren(  ) override;
-    sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) 
override;
+    sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    void SAL_CALL deselectAccessibleChild( sal_Int64 nSelectedChildIndex ) 
override;
 };
 
 
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx 
b/accessibility/inc/extended/textwindowaccessibility.hxx
index 2c8336b8181a..47bb7be81a0c 100644
--- a/accessibility/inc/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/extended/textwindowaccessibility.hxx
@@ -160,15 +160,15 @@ private:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext >
     SAL_CALL getAccessibleContext() override;
 
-    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-    getAccessibleChild(::sal_Int32 i) override;
+    getAccessibleChild(sal_Int64 i) override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
     getAccessibleParent() override;
 
-    virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
 
     virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
 
@@ -467,10 +467,10 @@ public:
     retrieveParagraphRelationSet( Paragraph const * pParagraph );
 
 private:
-    virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
-    SAL_CALL getAccessibleChild(::sal_Int32 i) override;
+    SAL_CALL getAccessibleChild(sal_Int64 i) override;
 
     virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
 
diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx 
b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 2d0f838a52d6..4bb176b8fcc1 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -77,9 +77,9 @@ protected:
     void                    UpdateAccessibleName( sal_Int32 i );
     void                    UpdateItemText( sal_Int32 i );
 
-    sal_Int32               GetChildCount() const;
+    sal_Int64               GetChildCount() const;
 
-    css::uno::Reference< css::accessibility::XAccessible > GetChild( sal_Int32 
i );
+    css::uno::Reference< css::accessibility::XAccessible > GetChild( sal_Int64 
i );
     css::uno::Reference< css::accessibility::XAccessible > GetChildAt( const 
css::awt::Point& rPoint );
 
     void                    InsertChild( sal_Int32 i );
diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx 
b/accessibility/inc/standard/accessiblemenucomponent.hxx
index b82a7c0ab57f..1e3feb81cb29 100644
--- a/accessibility/inc/standard/accessiblemenucomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenucomponent.hxx
@@ -51,8 +51,8 @@ public:
     DECLARE_XTYPEPROVIDER()
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
@@ -73,13 +73,13 @@ public:
     virtual OUString SAL_CALL getToolTipText(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
     virtual void SAL_CALL clearAccessibleSelection(  ) override;
     virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) 
override;
 };
 
 
diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx 
b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index 55550d53a36e..b6adebbde81e 100644
--- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -61,10 +61,10 @@ public:
     virtual ~OAccessibleMenuItemComponent() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx 
b/accessibility/inc/standard/vclxaccessiblebox.hxx
index dd3f6914c26c..9b1c5aadbc45 100644
--- a/accessibility/inc/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/standard/vclxaccessiblebox.hxx
@@ -69,13 +69,13 @@ public:
         actual list.  The text field is not provided for non drop down list
         boxes.
     */
-    sal_Int32 SAL_CALL getAccessibleChildCount() final override;
+    sal_Int64 SAL_CALL getAccessibleChildCount() final override;
     /** For drop down list boxes the text field is a not editable
         VCLXAccessibleTextField, for combo boxes it is an
         editable VCLXAccessibleEdit.
     */
     css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 i) override;
+        getAccessibleChild (sal_Int64 i) override;
     /** The role is always AccessibleRole::COMBO_BOX.
     */
     sal_Int16 SAL_CALL getAccessibleRole() override;
@@ -152,7 +152,7 @@ protected:
 
     virtual void FillAccessibleStateSet( sal_Int64& rStateSet ) override;
 
-    sal_Int32 implGetAccessibleChildCount();
+    sal_Int64 implGetAccessibleChildCount();
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx 
b/accessibility/inc/standard/vclxaccessibleedit.hxx
index 81659d2c9ea3..267f71e19632 100644
--- a/accessibility/inc/standard/vclxaccessibleedit.hxx
+++ b/accessibility/inc/standard/vclxaccessibleedit.hxx
@@ -66,8 +66,8 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleAction
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx 
b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
index 9069f991b2cd..505e0f2859d8 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbar.hxx
@@ -34,9 +34,9 @@ public:
     VCLXAccessibleHeaderBar(VCLXWindow* pVCLXindow);
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override;
     virtual css::uno::Reference<css::accessibility::XAccessible>
-        SAL_CALL getAccessibleChild(sal_Int32 i) override;
+        SAL_CALL getAccessibleChild(sal_Int64 i) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XServiceInfo
diff --git a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx 
b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
index 88bbc68e943b..e78950bded6f 100644
--- a/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessibleheaderbaritem.hxx
@@ -69,10 +69,10 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx 
b/accessibility/inc/standard/vclxaccessiblelist.hxx
index f1d5520a52da..74f6d5755d17 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -87,16 +87,16 @@ public:
         getAccessibleContext() override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount() override final;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount() override final;
     css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 i) override;
+        getAccessibleChild (sal_Int64 i) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         getAccessibleParent(  ) override;
 
     /** The index returned as index in parent is always the one set with the
         SetIndexInParent() method.
     */
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XServiceInfo
@@ -106,13 +106,13 @@ public:
         getSupportedServiceNames() override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
     virtual void SAL_CALL clearAccessibleSelection(  ) override;
     virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 
nSelectedChildIndex ) override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 
nSelectedChildIndex ) override;
 
     virtual css::awt::Point SAL_CALL getLocationOnScreen(  ) override;
     bool    IsInDropDown() const;
@@ -139,7 +139,7 @@ private:
 
     virtual ~VCLXAccessibleList() override = default;
 
-    sal_Int32 implGetAccessibleChildCount();
+    sal_Int64 implGetAccessibleChildCount();
 
     /** This function is called from the implementation helper during a
         XComponent::dispose call.  Free the list of items and the items 
themselves.
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 6952bd5eea1e..046f1df125a3 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -104,10 +104,10 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx 
b/accessibility/inc/standard/vclxaccessiblemenu.hxx
index 1bd7be7d1e77..e866a53a3d8a 100644
--- a/accessibility/inc/standard/vclxaccessiblemenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx
@@ -35,7 +35,7 @@ class VCLXAccessibleMenu final : public 
VCLXAccessibleMenuItem,
 {
     virtual bool        IsFocused() override;
     virtual bool        IsPopupMenuOpen() override;
-    sal_Int32           implGetSelectedAccessibleChildCount();
+    sal_Int64           implGetSelectedAccessibleChildCount();
 
 public:
     using VCLXAccessibleMenuItem::VCLXAccessibleMenuItem;
@@ -51,21 +51,21 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleComponent
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
     virtual void SAL_CALL clearAccessibleSelection(  ) override;
     virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) 
override;
 
     // XAccessibleAction
     virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 
nIndex ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx 
b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
index a81f0457f0be..c5b3984e0b7e 100644
--- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx
@@ -51,7 +51,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
 
     // XAccessibleExtendedComponent
diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx 
b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
index 2d4c486e677c..8e93af22d8d9 100644
--- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
+++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx
@@ -33,7 +33,7 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent() override;
     virtual sal_Int16 SAL_CALL getAccessibleRole() override;
 
     // XAccessibleExtendedComponent
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx 
b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
index bae4ed9d0985..16bff48e3856 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx
@@ -56,8 +56,8 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
 
     // XAccessibleComponent
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx 
b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
index 5be9739722dc..0e82ed4b3ab7 100644
--- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx
@@ -87,10 +87,10 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild(sal_Int32) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild(sal_Int64) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx 
b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
index ab6cdb620eb9..233e7277cb27 100644
--- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx
@@ -41,7 +41,7 @@ private:
     AccessibleChildren      m_aAccessibleChildren;
     VclPtr<TabControl>      m_pTabControl;
 
-    css::uno::Reference< css::accessibility::XAccessible > 
implGetAccessibleChild( sal_Int32 i );
+    css::uno::Reference< css::accessibility::XAccessible > 
implGetAccessibleChild( sal_Int64 i );
     bool implIsAccessibleChildSelected( sal_Int32 nChildIndex );
 
 
@@ -74,19 +74,19 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
     virtual void SAL_CALL clearAccessibleSelection(  ) override;
     virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) 
override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx 
b/accessibility/inc/standard/vclxaccessibletabpage.hxx
index 2d78f889264f..0548ef344634 100644
--- a/accessibility/inc/standard/vclxaccessibletabpage.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx
@@ -49,7 +49,7 @@ private:
     bool                    m_bSelected;
     OUString                m_sPageText;
 
-    sal_Int32               implGetAccessibleChildCount();
+    sal_Int64 implGetAccessibleChildCount();
 
     bool                    IsFocused() const;
     bool                    IsSelected() const;
@@ -95,10 +95,10 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx 
b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
index 36254ceeca37..826aa8daad91 100644
--- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
+++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx
@@ -45,7 +45,7 @@ public:
 
     // XAccessibleContext
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
 };
 
 
diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx 
b/accessibility/inc/standard/vclxaccessibletextfield.hxx
index 5d29de76624d..f99b6c0296f6 100644
--- a/accessibility/inc/standard/vclxaccessibletextfield.hxx
+++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx
@@ -51,9 +51,9 @@ public:
         getAccessibleContext() override;
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL getAccessibleChildCount() override;
+    sal_Int64 SAL_CALL getAccessibleChildCount() override;
     css::uno::Reference< css::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (sal_Int32 i) override;
+        getAccessibleChild (sal_Int64 i) override;
     sal_Int16 SAL_CALL getAccessibleRole() override;
     css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         getAccessibleParent(  ) override;
diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx 
b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
index 7518f3f7a154..0b2908d1dc32 100644
--- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx
@@ -51,7 +51,7 @@ private:
     void                        UpdateCustomPopupItemp_Impl( vcl::Window* 
pWindow, bool bOpen );
     void                        HandleSubToolBarEvent( const VclWindowEvent& 
rVclWindowEvent );
     void                        ReleaseSubToolBox( ToolBox* _pSubToolBox );
-    sal_Int32                   implGetAccessibleChildCount();
+    sal_Int64                   implGetAccessibleChildCount();
 
     virtual ~VCLXAccessibleToolBox() override;
 
@@ -79,18 +79,18 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
 
     // XAccessibleSelection
-    virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) 
override;
-    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex 
) override;
+    virtual void SAL_CALL selectAccessibleChild( sal_Int64 nChildIndex ) 
override;
+    virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int64 nChildIndex 
) override;
     virtual void SAL_CALL clearAccessibleSelection(  ) override;
     virtual void SAL_CALL selectAllAccessibleChildren(  ) override;
-    virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override;
-    virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) 
override;
+    virtual sal_Int64 SAL_CALL getSelectedAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getSelectedAccessibleChild( sal_Int64 nSelectedChildIndex ) override;
+    virtual void SAL_CALL deselectAccessibleChild( sal_Int64 nChildIndex ) 
override;
 
 private:
     void implReleaseToolboxItem(
diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx 
b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
index 9f93f9658791..39982db1b7e8 100644
--- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
+++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx
@@ -98,10 +98,10 @@ public:
     virtual css::uno::Reference< css::accessibility::XAccessibleContext > 
SAL_CALL getAccessibleContext(  ) override;
 
     // XAccessibleContext
-    virtual sal_Int32 SAL_CALL getAccessibleChildCount(  ) override;
-    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int32 i ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleChild( sal_Int64 i ) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
getAccessibleParent(  ) override;
-    virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) override;
+    virtual sal_Int64 SAL_CALL getAccessibleIndexInParent(  ) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole(  ) override;
     virtual OUString SAL_CALL getAccessibleDescription(  ) override;
     virtual OUString SAL_CALL getAccessibleName(  ) override;
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx 
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 6bc4865c6d4d..539f10df1cc3 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -90,7 +90,7 @@ void SAL_CALL AccessibleBrowseBox::disposing()
 
 // css::accessibility::XAccessibleContext
 
-sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
+sal_Int64 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount()
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -100,11 +100,14 @@ sal_Int32 SAL_CALL 
AccessibleBrowseBox::getAccessibleChildCount()
 
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex )
+AccessibleBrowseBox::getAccessibleChild( sal_Int64 nChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
 
+    if (nChildIndex < 0 || nChildIndex >= getAccessibleChildCount())
+        throw lang::IndexOutOfBoundsException();
+
     css::uno::Reference< css::accessibility::XAccessible > xRet;
     if( nChildIndex >= 0 )
     {
@@ -223,7 +226,7 @@ 
AccessibleBrowseBox::implGetHeaderBar(AccessibleBrowseBoxObjType eObjType)
 }
 
 css::uno::Reference< css::accessibility::XAccessible >
-AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex )
+AccessibleBrowseBox::implGetFixedChild( sal_Int64 nChildIndex )
 {
     css::uno::Reference< css::accessibility::XAccessible > xRet;
     switch( nChildIndex )
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 69981e9640aa..a3b0b0891c53 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -126,13 +126,13 @@ Reference< css::accessibility::XAccessible > SAL_CALL 
AccessibleBrowseBoxBase::g
     return mxParent;
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
 
     // -1 for child not found/no parent (according to specification)
-    sal_Int32 nRet = -1;
+    sal_Int64 nRet = -1;
 
     css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< 
css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY );
 
@@ -145,8 +145,8 @@ sal_Int32 SAL_CALL 
AccessibleBrowseBoxBase::getAccessibleIndexInParent()
         {
             css::uno::Reference< uno::XInterface > xChild;
 
-            sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
-            for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild )
+            sal_Int64 nChildCount = xParentContext->getAccessibleChildCount();
+            for( sal_Int64 nChild = 0; nChild < nChildCount; ++nChild )
             {
                 xChild.set(xParentContext->getAccessibleChild( nChild ), 
css::uno::UNO_QUERY);
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 6efbb5a1199a..645b544176d2 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -123,12 +123,12 @@ namespace accessibility
     }
 
     // XAccessibleContext
-    sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount(  )
+    sal_Int64 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount(  )
     {
         return 0;
     }
 
-    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 )
+    css::uno::Reference< css::accessibility::XAccessible > SAL_CALL 
AccessibleCheckBoxCell::getAccessibleChild( sal_Int64 )
     {
         throw css::lang::IndexOutOfBoundsException();
     }
@@ -138,12 +138,12 @@ namespace accessibility
         return "com.sun.star.comp.svtools.TableCheckBoxCell";
     }
 
-    sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent()
+    sal_Int64 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent()
     {
         ::osl::MutexGuard aGuard( getMutex() );
         ensureIsAlive();
 
-        return ( getRowPos() * mpBrowseBox->GetColumnCount() ) + 
getColumnPos();
+        return (static_cast<sal_Int64>(getRowPos()) * 
static_cast<sal_Int64>(mpBrowseBox->GetColumnCount())) + getColumnPos();
     }
 
     void AccessibleCheckBoxCell::SetChecked( bool _bChecked )
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 3d3541e4a19b..50f5d0c33422 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -52,7 +52,7 @@ AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar()
 // XAccessibleContext ---------------------------------------------------------
 
 Reference< XAccessible > SAL_CALL
-AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex )
+AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int64 nChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -61,7 +61,7 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 
nChildIndex )
     return implGetChild( nChildIndex, implToVCLColumnPos( nChildIndex ) );
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent()
 {
     return isRowBar() ? vcl::BBINDEX_ROWHEADERBAR : 
vcl::BBINDEX_COLUMNHEADERBAR;
 }
@@ -192,7 +192,7 @@ sal_Bool SAL_CALL 
AccessibleBrowseBoxHeaderBar::isAccessibleSelected(
 
 // XAccessibleSelection -------------------------------------------------------
 
-void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 
nChildIndex )
+void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int64 
nChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -204,7 +204,7 @@ void SAL_CALL 
AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nCh
         implSelectColumn( implToVCLColumnPos( nChildIndex ), true );
 }
 
-sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( 
sal_Int32 nChildIndex )
+sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( 
sal_Int64 nChildIndex )
 {
     // using interface methods - no mutex
     return isRowBar() ?
@@ -232,7 +232,7 @@ void SAL_CALL 
AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren()
         implSelectColumn( implToVCLColumnPos( 0 ), true );
 }
 
-sal_Int32 SAL_CALL 
AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount()
+sal_Int64 SAL_CALL 
AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount()
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -241,18 +241,19 @@ sal_Int32 SAL_CALL 
AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount
 }
 
 Reference< XAccessible > SAL_CALL
-AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 
nSelectedChildIndex )
+AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int64 
nSelectedChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
 
     // method may throw lang::IndexOutOfBoundsException
-    sal_Int32 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex 
);
+    sal_Int64 nIndex = implGetChildIndexFromSelectedIndex( nSelectedChildIndex 
);
+    assert(nIndex < std::numeric_limits<sal_Int32>::max());
     return implGetChild( nIndex, implToVCLColumnPos( nIndex ) );
 }
 
 void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild(
-        sal_Int32 nSelectedChildIndex )
+        sal_Int64 nSelectedChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -332,8 +333,8 @@ Reference< XAccessible > 
AccessibleBrowseBoxHeaderBar::implGetChild(
         mpBrowseBox->CreateAccessibleColumnHeader( nColumnPos );
 }
 
-sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex(
-        sal_Int32 nSelectedChildIndex )
+sal_Int64 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex(
+        sal_Int64 nSelectedChildIndex )
 {
     Sequence< sal_Int32 > aSelSeq;
     if( isRowBar() )
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 610d4f9fe4c5..619e7780947e 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -76,7 +76,7 @@ sal_Int64 AccessibleBrowseBoxHeaderCell::implCreateStateSet()
 /** @return
         The count of visible children.
 */
-sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
+sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
 {
     return 0;
 }
@@ -85,7 +85,7 @@ sal_Int32 SAL_CALL 
AccessibleBrowseBoxHeaderCell::getAccessibleChildCount()
 /** @return
         The XAccessible interface of the specified child.
 */
-Reference<XAccessible > SAL_CALL 
AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int32 )
+Reference<XAccessible > SAL_CALL 
AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int64 )
 {
     throw IndexOutOfBoundsException();
 }
@@ -139,11 +139,11 @@ tools::Rectangle 
AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen()
     return getRectangle(mpBrowseBox,m_nColumnRowId,true,isRowBarCell());
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent()
 {
     ::osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
-    sal_Int32 nIndex = m_nColumnRowId;
+    sal_Int64 nIndex = m_nColumnRowId;
     if ( mpBrowseBox->HasRowHeader() )
         --nIndex;
     return nIndex;
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index d245c5155ba8..9b58bf83d785 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -49,7 +49,7 @@ AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable()
 // XAccessibleContext ---------------------------------------------------------
 
 Reference< XAccessible > SAL_CALL
-AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex )
+AccessibleBrowseBoxTable::getAccessibleChild( sal_Int64 nChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -59,7 +59,7 @@ AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 
nChildIndex )
         implGetRow( nChildIndex ), static_cast<sal_Int16>(implGetColumn( 
nChildIndex )) );
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent()
 {
     osl::MutexGuard aGuard( getMutex() );
     ensureIsAlive();
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index ebb6e06e099d..a1ae5a969dcb 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -47,7 +47,7 @@ AccessibleBrowseBoxTableBase::AccessibleBrowseBoxTableBase(
 
 // XAccessibleContext ---------------------------------------------------------
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount()
+sal_Int64 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount()
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -107,16 +107,16 @@ Reference< XAccessible > SAL_CALL 
AccessibleBrowseBoxTableBase::getAccessibleSum
     return nullptr;    // not supported
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex(
+sal_Int64 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex(
         sal_Int32 nRow, sal_Int32 nColumn )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
     ensureIsValidAddress( nRow, nColumn );
-    return nRow * implGetColumnCount() + nColumn;
+    return static_cast<sal_Int64>(nRow) * 
static_cast<sal_Int64>(implGetColumnCount()) + nColumn;
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 
nChildIndex )
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int64 
nChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -124,7 +124,7 @@ sal_Int32 SAL_CALL 
AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nCh
     return implGetRow( nChildIndex );
 }
 
-sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( 
sal_Int32 nChildIndex )
+sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( 
sal_Int64 nChildIndex )
 {
     SolarMethodGuard aGuard(getMutex());
     ensureIsAlive();
@@ -201,18 +201,18 @@ sal_uInt16 
AccessibleBrowseBoxTableBase::implToVCLColumnPos( sal_Int32 nColumn )
     return nVCLPos;
 }
 
-sal_Int32 AccessibleBrowseBoxTableBase::implGetChildCount() const
+sal_Int64 AccessibleBrowseBoxTableBase::implGetChildCount() const
 {
-    return implGetRowCount() * implGetColumnCount();
+    return static_cast<sal_Int64>(implGetRowCount()) * 
static_cast<sal_Int64>(implGetColumnCount());
 }
 
-sal_Int32 AccessibleBrowseBoxTableBase::implGetRow( sal_Int32 nChildIndex ) 
const
+sal_Int32 AccessibleBrowseBoxTableBase::implGetRow( sal_Int64 nChildIndex ) 
const
 {
     sal_Int32 nColumns = implGetColumnCount();
     return nColumns ? (nChildIndex / nColumns) : 0;
 }
 
-sal_Int32 AccessibleBrowseBoxTableBase::implGetColumn( sal_Int32 nChildIndex ) 
const
+sal_Int32 AccessibleBrowseBoxTableBase::implGetColumn( sal_Int64 nChildIndex ) 
const
 {
     sal_Int32 nColumns = implGetColumnCount();
     return nColumns ? (nChildIndex % nColumns) : 0;
@@ -279,7 +279,7 @@ void AccessibleBrowseBoxTableBase::ensureIsValidAddress(
     ensureIsValidColumn( nColumn );
 }
 
-void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex )
+void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int64 nChildIndex )
 {
     if( nChildIndex >= implGetChildCount() )
         throw lang::IndexOutOfBoundsException( "child index is invalid", *this 
);
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 9ebda45ddc8c..0b9110e361cf 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -142,14 +142,14 @@ namespace accessibility
     }
 
     /** @return  The count of visible children. */
-    sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount()
+    sal_Int64 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount()
     {
         return 0;
     }
 
     /** @return  The XAccessible interface of the specified child. */
     css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-        AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int32 )
+        AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int64 )
     {
         throw css::lang::IndexOutOfBoundsException();
     }
@@ -189,12 +189,12 @@ namespace accessibility
 
     // XAccessibleContext -----------------------------------------------------
 
-    sal_Int32 SAL_CALL 
AccessibleBrowseBoxTableCell::getAccessibleIndexInParent()
+    sal_Int64 SAL_CALL 
AccessibleBrowseBoxTableCell::getAccessibleIndexInParent()
     {
         SolarMethodGuard aGuard(getMutex());
         ensureIsAlive();
 
-        return /*vcl::BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * 
mpBrowseBox->GetColumnCount() ) + getColumnPos();
+        return /*vcl::BBINDEX_FIRSTCONTROL*/ m_nOffset + 
(static_cast<sal_Int64>(getRowPos()) * 
static_cast<sal_Int64>(mpBrowseBox->GetColumnCount())) + getColumnPos();
     }
 
     sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition(  )
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx 
b/accessibility/source/extended/AccessibleGridControl.cxx
index a3d016194a27..800ab312d19e 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -71,7 +71,7 @@ void SAL_CALL AccessibleGridControl::disposing()
     AccessibleGridControlBase::disposing();
 }
 
-sal_Int32 AccessibleGridControl::implGetAccessibleChildCount()
+sal_Int64 AccessibleGridControl::implGetAccessibleChildCount()
 {
     return m_aTable.GetAccessibleControlCount();
 }
@@ -79,7 +79,7 @@ sal_Int32 AccessibleGridControl::implGetAccessibleChildCount()
 // css::accessibility::XAccessibleContext 
---------------------------------------------------------
 
 
-sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount()
+sal_Int64 SAL_CALL AccessibleGridControl::getAccessibleChildCount()
 {
     SolarMutexGuard aSolarGuard;
     ensureIsAlive();
@@ -88,7 +88,7 @@ sal_Int32 SAL_CALL 
AccessibleGridControl::getAccessibleChildCount()
 
 
 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
-AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex )
+AccessibleGridControl::getAccessibleChild( sal_Int64 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -233,7 +233,7 @@ AccessibleGridControl::implGetHeaderBar( 
AccessibleTableControlObjType eObjType
 }
 
 css::uno::Reference< css::accessibility::XAccessible >
-AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex )
+AccessibleGridControl::implGetFixedChild( sal_Int64 nChildIndex )
 {
     css::uno::Reference< css::accessibility::XAccessible > xRet;
     switch( nChildIndex )
@@ -263,10 +263,10 @@ rtl::Reference<AccessibleGridControlTable> 
AccessibleGridControl::createAccessib
 
 void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& 
_rNewValue,const Any& _rOldValue)
 {
-    sal_Int32 nChildCount = implGetAccessibleChildCount();
+    sal_Int64 nChildCount = implGetAccessibleChildCount();
     if(nChildCount != 0)
     {
-        for(sal_Int32 i=0;i<nChildCount;i++)
+        for(sal_Int64 i=0;i<nChildCount;i++)
         {
             css::uno::Reference< css::accessibility::XAccessible > xAccessible 
= getAccessibleChild(i);
             if(css::uno::Reference< css::accessibility::XAccessible 
>(m_xTable) == xAccessible)
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx 
b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 79a57029259d..37e3235ee711 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -94,14 +94,14 @@ css::uno::Reference< css::accessibility::XAccessible > 
SAL_CALL AccessibleGridCo
     return m_xParent;
 }
 
-sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent()
 {
     SolarMutexGuard g;
 
     ensureIsAlive();
 
     // -1 for child not found/no parent (according to specification)
-    sal_Int32 nRet = -1;
+    sal_Int64 nRet = -1;
 
     css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< 
css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY );
 
@@ -114,8 +114,8 @@ sal_Int32 SAL_CALL 
AccessibleGridControlBase::getAccessibleIndexInParent()
         {
             css::uno::Reference< uno::XInterface > xChild;
 
-            sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
-            for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild )
+            sal_Int64 nChildCount = xParentContext->getAccessibleChildCount();
+            for( sal_Int64 nChild = 0; nChild < nChildCount; ++nChild )
             {
                 xChild.set(xParentContext->getAccessibleChild( nChild ), 
css::uno::UNO_QUERY);
                 if ( xMeMyselfAndI.get() == xChild.get() )
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx 
b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index 077e3ea5b6dd..3c6a2edb9a5a 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -51,7 +51,7 @@ AccessibleGridControlHeader::AccessibleGridControlHeader(
 // XAccessibleContext ---------------------------------------------------------
 
 Reference< XAccessible > SAL_CALL
-AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex )
+AccessibleGridControlHeader::getAccessibleChild( sal_Int64 nChildIndex )
 {
     SolarMutexGuard aSolarGuard;
 
@@ -72,7 +72,7 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 
nChildIndex )
     return xChild;
 }
 
-sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent()
 {
     SolarMutexGuard aSolarGuard;
 
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx 
b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx

... etc. - the rest is truncated

Reply via email to