From 1b13c952f50aab2b907dab13395ab23d0955c238 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 15 Feb 2013 17:12:00 +0000 Subject: Resolves: rhbz#895196 sc filter float a11y parent of itself loop/recurse Change-Id: I3679e7cfcd32a78b40c6a7b803c92ff0abe6f32c --- accessibility/source/helper/acc_factory.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'accessibility/source') diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index dc16fe664992..93f6bf54912e 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -382,9 +382,11 @@ inline bool hasFloatingChild(Window *pWindow) } else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) { - PopupMenuFloatingWindow* pChild = dynamic_cast( - pWindow->GetAccessibleChildWindow(0)); - if ( pChild && pChild->IsPopupMenu() ) + // The logic here has to match that of Window::GetAccessibleParentWindow in + // vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow + // becoming a11y parents of themselves + Window* pChild = pWindow->GetAccessibleChildWindow(0); + if (PopupMenuFloatingWindow::isPopupMenu(pChild)) { // Get the accessible context from the child window. Reference xAccessible = pChild->CreateAccessible(); -- cgit v1.2.3