Attachment 66907 Details for Bug 47368 – a new patch

[patch] a new patch

osx-a11-fix2.diff (text/plain), 1.63 KB, created by Michael Meeks on 2012-09-10 09:19:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Meeks

Created: 2012-09-10 09:19:30 UTC

Size: 1.63 KB

patch

obsolete

>diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
>index 86bc720..1c0aed3 100644
>--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
>+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
>@@ -970,16 +970,9 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin
>             com::sun::star::awt::Point location = rxAccessibleComponent -> getLocationOnScreen();
>             com::sun::star::awt::Point hitPoint ( point.X - location.X , point.Y - location.Y); 
>             Reference < XAccessible > rxAccessible = rxAccessibleComponent -> getAccessibleAtPoint ( hitPoint );
>-            if ( rxAccessible.is() && rxAccessible -> getAccessibleContext().is() ) {
>-                if ( rxAccessible -> getAccessibleContext() -> getAccessibleChildCount() > 0 ) {
>-                    hitChild = hitTestRunner ( point, rxAccessible -> getAccessibleContext() );
>-                    if ( ! hitChild.is() ) {
>-                        hitChild = rxAccessible -> getAccessibleContext();
>-                    }
>-                } else {
>-                    hitChild = rxAccessible -> getAccessibleContext();
>-                }
>-            }
>+            if ( rxAccessible.is() && rxAccessible -> getAccessibleContext().is() &&
>+                 rxAccessible -> getAccessibleContext() -> getAccessibleChildCount() == 0 )
>+                hitChild = rxAccessible -> getAccessibleContext();
>         } 
>         if ( !hitChild.is() && rxAccessibleContext -> getAccessibleChildCount() > 0 ) { // special treatment for e.g. comboboxes
>             for ( int i = 0; i < rxAccessibleContext -> getAccessibleChildCount(); i++ ) {

Actions: View

Attachments on bug 47368: 58540 | 64540 | 64623 | 66880 | 66904 | 66907 | 67635