From a854500861e469835b8d1fd37ac86b1b514c43a6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Jun 2020 15:16:52 +0100 Subject: PopupMenuFloatingWindow is now unused MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie8fa026becb1899e466fb0e7dbb987290788aaf2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96207 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- accessibility/source/helper/acc_factory.cxx | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'accessibility') diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 02d75771fb98..3ede3d7157df 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -57,7 +57,6 @@ #include #include #include -#include #include @@ -328,19 +327,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLX else if ( nType == WindowType::BORDERWINDOW && hasFloatingChild( pWindow ) ) { - // The logic here has to match that of Window::GetAccessibleParentWindow in - // vcl/source/window/window.cxx to avoid PopupMenuFloatingWindow - // becoming a11y parents of themselves - vcl::Window* pChild = pWindow->GetAccessibleChildWindow(0); - if (PopupMenuFloatingWindow::isPopupMenu(pChild)) - { - // Get the accessible context from the child window. - Reference xAccessible = pChild->CreateAccessible(); - if (xAccessible.is()) - xContext = xAccessible->getAccessibleContext(); - } - else - xContext = new FloatingWindowAccessible( _pXWindow ); + xContext = new FloatingWindowAccessible( _pXWindow ); } else if ( ( nType == WindowType::HELPTEXTWINDOW ) || ( nType == WindowType::FIXEDLINE ) ) -- cgit