diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-27 11:28:57 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-10 16:37:10 +0100 |
| commit | 22efaf5f46a918adc4d404e74466713dafc20130 (patch) | |
| tree | b635fcb286d1ac084200f15f0a780e7d5d42d81f /editeng | |
| parent | d8c0d479c8e5e45841e7e80c7412eeef7862eaa4 (diff) | |
IAccessible2: revert some bounds-checking changes again
...that were introduced with c23ab5eaed57cc3fb5860e26c591c73c5b22687b "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
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 7bd87b04538a..5a575be2cd05 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -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; |