diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-12 15:16:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-12 20:13:46 +0200 |
| commit | a854500861e469835b8d1fd37ac86b1b514c43a6 (patch) | |
| tree | f388dd25baa440f69a6d9dda6e5432ed5e81e158 /accessibility | |
| parent | ea84e714a49fae80b20a9e4706b0274126614611 (diff) | |
PopupMenuFloatingWindow is now unused
Change-Id: Ie8fa026becb1899e466fb0e7dbb987290788aaf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96207
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/helper/acc_factory.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
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 <vcl/toolkit/combobox.hxx> #include <extended/AccessibleGridControl.hxx> #include <vcl/accessibletable.hxx> -#include <vcl/popupmenuwindow.hxx> #include <floatingwindowaccessible.hxx> @@ -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> 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 ) ) |