Author: steve_y Date: Mon Nov 11 08:26:44 2013 New Revision: 1540633 URL: http://svn.apache.org/r1540633 Log: Fix for i123619
Modified: openoffice/branches/ia2/main/winaccessibility/source/service/AccTopWindowListener.cxx Modified: openoffice/branches/ia2/main/winaccessibility/source/service/AccTopWindowListener.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/AccTopWindowListener.cxx?rev=1540633&r1=1540632&r2=1540633&view=diff ============================================================================== --- openoffice/branches/ia2/main/winaccessibility/source/service/AccTopWindowListener.cxx (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/AccTopWindowListener.cxx Mon Nov 11 08:26:44 2013 @@ -54,7 +54,6 @@ using namespace com::sun::star::bridge; using namespace com::sun::star::awt; using namespace rtl; using namespace cppu; -using namespace com::sun::star::accessibility; ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// @@ -196,33 +195,7 @@ void AccTopWindowListener::AddAllListene if(com::sun::star::accessibility::AccessibleRole::DOCUMENT == role ) { if(accManagerAgent.IsStateManageDescendant(pAccessible)) - { - // Here, for sw document, the last children may be post it window or ole window, they need to be cached because their focus event - // won't be handled together with other children. - int count = pAccessibleContext->getAccessibleChildCount(); - sal_Bool bValid = sal_True; - for (int i = count - 1; i >= 0 && bValid; i--) - { - Reference<XAccessible> mxAccessible = pAccessibleContext->getAccessibleChild(i); - XAccessible* mpAccessible = mxAccessible.get(); - if (mpAccessible != NULL) - { - Reference< XAccessibleContext > xChildContext = mpAccessible->getAccessibleContext(); - if (xChildContext.is()) - { - short childRole = xChildContext->getAccessibleRole(); - if (childRole == com::sun::star::accessibility::AccessibleRole::WINDOW || - childRole == com::sun::star::accessibility::AccessibleRole::SCROLL_PANE) - { - AddAllListeners(mpAccessible,pAccessible,pWND); - } - else - bValid = sal_False; - } - } - else - bValid = sal_False; - } + { return ; } }