diff options
Diffstat (limited to 'toolkit')
11 files changed, 40 insertions, 40 deletions
diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx index ebe928218535..20065b86f101 100644 --- a/toolkit/inc/controls/accessiblecontrolcontext.hxx +++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx @@ -68,8 +68,8 @@ namespace toolkit private: // 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; diff --git a/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java index a3fac8c3dec0..d2c9b0f68a43 100644 --- a/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java +++ b/toolkit/qa/complex/toolkit/AccessibleStatusBarItem.java @@ -250,10 +250,10 @@ public class AccessibleStatusBarItem { } public void runAllInterfaceTests() { - int count = testObject.getAccessibleChildCount(); + long count = testObject.getAccessibleChildCount(); System.out.println("*****"); System.out.println("**** Found items to test: " + count); - for (int i=0;i<count;i++){ + for (long i = 0; i < count; i++) { System.out.println("**** Now testing StatusBarItem " + i + "."); XAccessible object = null; try { diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java index 3d4df2c5ff19..e55cb1a22a1a 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleComponent.java @@ -219,8 +219,8 @@ public class _XAccessibleComponent { + (chBnd.X ) + "," + chBnd.Y + ") - OK"); boolean res = util.AccessibilityTools.equals(xAccCh, xAcc); if (!res) { - int expIndex = xAccCh.getAccessibleContext().getAccessibleIndexInParent(); - int gotIndex = xAcc.getAccessibleContext().getAccessibleIndexInParent(); + long expIndex = xAccCh.getAccessibleContext().getAccessibleIndexInParent(); + long gotIndex = xAcc.getAccessibleContext().getAccessibleIndexInParent(); if (expIndex < gotIndex) { System.out.println("The children found is not the same"); System.out.println("The expected child " + @@ -387,7 +387,7 @@ public class _XAccessibleComponent { return new XAccessibleComponent[0]; } XAccessibleContext xAccCon = xAcc.getAccessibleContext(); - int cnt = xAccCon.getAccessibleChildCount(); + long cnt = xAccCon.getAccessibleChildCount(); // for cases when too many children exist checking only first 50 if (cnt > 50) @@ -396,7 +396,7 @@ public class _XAccessibleComponent { } ArrayList<XAccessibleComponent> childComp = new ArrayList<XAccessibleComponent>(); - for (int i = 0; i < cnt; i++) { + for (long i = 0; i < cnt; i++) { try { XAccessible child = xAccCon.getAccessibleChild(i); XAccessibleContext xAccConCh = child.getAccessibleContext(); diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java index e52855efa01a..645b3b03b9ef 100644 --- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java +++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleContext.java @@ -49,7 +49,7 @@ public class _XAccessibleContext { private final XAccessibleContext oObj; - private int childCount = 0; + private long childCount = 0; private XAccessible parent = null ; public _XAccessibleContext(XInterface object) { @@ -80,12 +80,12 @@ public class _XAccessibleContext { */ public boolean _getAccessibleChild() { boolean bOK = true; - int counter = childCount; + long counter = childCount; if (childCount > 500) { counter = 500; } - for (int i = 0; i < counter; i++) { + for (long i = 0; i < counter; i++) { try { XAccessible ch = oObj.getAccessibleChild(i) ; XAccessibleContext chAC = ch.getAccessibleContext(); @@ -151,7 +151,7 @@ public class _XAccessibleContext { public boolean _getAccessibleIndexInParent() { boolean bOK = true; - int idx = oObj.getAccessibleIndexInParent(); + long idx = oObj.getAccessibleIndexInParent(); XAccessibleContext parentAC = parent.getAccessibleContext() ; try { diff --git a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx index 4e9ed7a1ee00..fa5fb9f7054f 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleComponentTester.cxx @@ -138,9 +138,9 @@ void XAccessibleComponentTester::testContainsPoint() */ void XAccessibleComponentTester::testAccessibleAtPoint() { - int count = mxContext->getAccessibleChildCount(); + sal_Int64 count = mxContext->getAccessibleChildCount(); std::cout << "Found " << count << " children" << std::endl; - for (int i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) + for (sal_Int64 i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) { auto child = mxContext->getAccessibleChild(i); uno::Reference<accessibility::XAccessibleContext> childContext( diff --git a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx index e9b605c73956..9d7fdb992eae 100644 --- a/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx +++ b/toolkit/qa/cppunit/a11y/XAccessibleContextTester.cxx @@ -33,8 +33,8 @@ */ void XAccessibleContextTester::testGetAccessibleChild() { - int count = mxContext->getAccessibleChildCount(); - for (int i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) + sal_Int64 count = mxContext->getAccessibleChildCount(); + for (sal_Int64 i = 0; i < count && i < AccessibilityTools::MAX_CHILDREN; i++) { auto child = mxContext->getAccessibleChild(i); auto childCtx = child->getAccessibleContext(); @@ -55,9 +55,9 @@ void XAccessibleContextTester::testGetAccessibleChild() */ void XAccessibleContextTester::testGetAccessibleChildCount() { - auto childCount = mxContext->getAccessibleChildCount(); + sal_Int64 childCount = mxContext->getAccessibleChildCount(); std::cout << childCount << " children found." << std::endl; - CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int32>(0), childCount); + CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int64>(0), childCount); } /** @@ -80,7 +80,7 @@ void XAccessibleContextTester::testGetAccessibleDescription() */ void XAccessibleContextTester::testGetAccessibleIndexInParent() { - int idx = mxContext->getAccessibleIndexInParent(); + sal_Int64 idx = mxContext->getAccessibleIndexInParent(); std::cout << "The index in parent is " << idx << std::endl; auto parent = mxContext->getAccessibleParent(); diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index b45b1084e7d8..b7c44f53bd68 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -491,18 +491,18 @@ TRANSIENT // accessibility::XAccessibleContext -sal_Int32 VCLXAccessibleComponent::getAccessibleChildCount() +sal_Int64 VCLXAccessibleComponent::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); - sal_Int32 nChildren = 0; + sal_Int64 nChildren = 0; if ( GetWindow() ) nChildren = GetWindow()->GetAccessibleChildWindowCount(); return nChildren; } -uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int32 i ) +uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -542,11 +542,11 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi return xAcc; } -sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) +sal_Int64 VCLXAccessibleComponent::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndex = -1; + sal_Int64 nIndex = -1; if ( GetWindow() ) { @@ -561,8 +561,8 @@ sal_Int32 VCLXAccessibleComponent::getAccessibleIndexInParent( ) uno::Reference< accessibility::XAccessibleContext > xParentContext ( xParentAcc->getAccessibleContext() ); if ( xParentContext.is() ) { - sal_Int32 nChildCount = xParentContext->getAccessibleChildCount(); - for ( sal_Int32 i=0; i<nChildCount; i++ ) + sal_Int64 nChildCount = xParentContext->getAccessibleChildCount(); + for ( sal_Int64 i = 0; i < nChildCount; i++ ) { uno::Reference< accessibility::XAccessible > xChild( xParentContext->getAccessibleChild(i) ); if ( xChild.is() ) @@ -664,7 +664,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi OExternalLockGuard aGuard( this ); uno::Reference< accessibility::XAccessible > xChild; - for ( sal_uInt32 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = getAccessibleChildCount(); i < nCount; ++i ) { uno::Reference< accessibility::XAccessible > xAcc = getAccessibleChild( i ); if ( xAcc.is() ) diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx index 07b9e8e98018..fa6d43f0b374 100644 --- a/toolkit/source/controls/accessiblecontrolcontext.cxx +++ b/toolkit/source/controls/accessiblecontrolcontext.cxx @@ -126,14 +126,14 @@ namespace toolkit } - sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) + sal_Int64 SAL_CALL OAccessibleControlContext::getAccessibleChildCount( ) { // we do not have children return 0; } - Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) + Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int64 ) { // we do not have children throw IndexOutOfBoundsException(); diff --git a/toolkit/test/accessibility/AccessibleCellHandler.java b/toolkit/test/accessibility/AccessibleCellHandler.java index c251f679064c..716e1374ef4a 100644 --- a/toolkit/test/accessibility/AccessibleCellHandler.java +++ b/toolkit/test/accessibility/AccessibleCellHandler.java @@ -77,7 +77,7 @@ class AccessibleCellHandler extends NodeHandler { case 0: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); aChild = new StringNode ("# table row: " + nRow, aParent); @@ -85,7 +85,7 @@ class AccessibleCellHandler extends NodeHandler break; case 1: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nCol = xTable.getAccessibleColumn( nChild ); aChild = new StringNode ("# table column: " + nCol, aParent); @@ -93,7 +93,7 @@ class AccessibleCellHandler extends NodeHandler break; case 2: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); int nCol = xTable.getAccessibleColumn( nChild ); int nExt = xTable.getAccessibleRowExtentAt( nRow, nCol ); @@ -103,7 +103,7 @@ class AccessibleCellHandler extends NodeHandler break; case 3: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); int nCol = xTable.getAccessibleColumn( nChild ); int nExt = xTable.getAccessibleColumnExtentAt( nRow, nCol ); @@ -113,7 +113,7 @@ class AccessibleCellHandler extends NodeHandler break; case 4: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); int nCol = xTable.getAccessibleColumn( nChild ); XAccessible xChild = @@ -135,7 +135,7 @@ class AccessibleCellHandler extends NodeHandler break; case 6: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nRow = xTable.getAccessibleRow( nChild ); boolean bSelected = xTable.isAccessibleRowSelected( nRow ); @@ -145,7 +145,7 @@ class AccessibleCellHandler extends NodeHandler break; case 7: { - int nChild = xContext.getAccessibleIndexInParent(); + long nChild = xContext.getAccessibleIndexInParent(); int nCol = xTable.getAccessibleColumn( nChild ); boolean bSelected = xTable.isAccessibleColumnSelected( nCol ); diff --git a/toolkit/test/accessibility/AccessibleSelectionHandler.java b/toolkit/test/accessibility/AccessibleSelectionHandler.java index 4a8cd24ba9c9..41eae0d980fa 100644 --- a/toolkit/test/accessibility/AccessibleSelectionHandler.java +++ b/toolkit/test/accessibility/AccessibleSelectionHandler.java @@ -72,12 +72,12 @@ class AccessibleSelectionHandler { VectorNode aVNode = new VectorNode( "Selected Children", aParent); - int nSelected = 0; - int nCount = ((AccTreeNode)aParent).getContext(). + long nSelected = 0; + long nCount = ((AccTreeNode)aParent).getContext(). getAccessibleChildCount(); try { - for( int i = 0; i < nCount; i++ ) + for( long i = 0; i < nCount; i++ ) { try { diff --git a/toolkit/test/accessibility/AccessibleTreeHandler.java b/toolkit/test/accessibility/AccessibleTreeHandler.java index e022dbae8d6b..09fe7902517c 100644 --- a/toolkit/test/accessibility/AccessibleTreeHandler.java +++ b/toolkit/test/accessibility/AccessibleTreeHandler.java @@ -101,7 +101,7 @@ class AccessibleTreeHandler XAccessibleContext xContext = xChild.getAccessibleContext(); if (xContext != null) { - int nIndex = xContext.getAccessibleIndexInParent() + 1; + long nIndex = xContext.getAccessibleIndexInParent() + 1; synchronized (maChildList) { if ((nIndex >= 0) || (nIndex <= maChildList.size())) |