[Libreoffice-commits] core.git: editeng/source

[Stephan Bergmann]

 editeng/source/accessibility/AccessibleEditableTextPara.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 4f94f16ba15218e5e7a9eb4d72ddb4cb62884dbb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 27 11:28:57 2013 +0100

    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

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index e9941df..614294f 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;