IAccessible2: revert some bounds-checking changes again
...that were introduced with c23ab5eaed
"Integrate
branch of IAccessible2" but broke JunitTest_sc_unoapi, which expects calls to
getCharacterAttributes and getIndexAtPoint to actually fail for out-of-bounds
arguments. The above commit does not make it obvious why those changes were
actually made.
Change-Id: I3492c3e6a49d68885df1206e9368f4483c0dc4f9
This commit is contained in:
@@ -1381,11 +1381,7 @@ namespace accessibility
|
||||
EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
|
||||
if (aBulletInfo.bVisible)
|
||||
nIndex += aBulletInfo.aText.getLength();
|
||||
if (nIndex != 0 && nIndex >= getCharacterCount())
|
||||
nIndex = getCharacterCount()-1;
|
||||
//
|
||||
if (nIndex != 0)
|
||||
CheckIndex(nIndex); // may throw IndexOutOfBoundsException
|
||||
CheckIndex(nIndex); // may throw IndexOutOfBoundsException
|
||||
|
||||
bool bSupplementalMode = false;
|
||||
uno::Sequence< OUString > aPropertyNames = rRequestedAttributes;
|
||||
@@ -1534,9 +1530,6 @@ namespace accessibility
|
||||
|
||||
SolarMutexGuard aGuard;
|
||||
|
||||
if ((rPoint.X <= 0) && (rPoint.Y <= 0))
|
||||
return 0;
|
||||
|
||||
sal_Int32 nPara;
|
||||
sal_uInt16 nIndex;
|
||||
|
||||
|
Reference in New Issue
Block a user