vcl/aqua/source/a11y/aqua11ywrapper.mm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
New commits: commit 7494e0a8d15386f4b962649e4286ddb05732355f Author: Michael Meeks <[email protected]> Date: Mon Sep 10 12:50:44 2012 +0300 fdo#47368: Fix for infinite recursion See bug for discussion. Change-Id: Id45dd2902bd2cb68618c3e7324867f226c025698 Signed-off-by: Tor Lillqvist <[email protected]> diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index 1468288..9f4e55e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -979,15 +979,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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
