diff options
| -rw-r--r-- | accessibility/source/helper/acc_factory.cxx | 8 | ||||
| -rw-r--r-- | vcl/inc/vcl/popupmenuwindow.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/popupmenuwindow.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 12 |
4 files changed, 23 insertions, 6 deletions
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<PopupMenuFloatingWindow*>( - 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> xAccessible = pChild->CreateAccessible(); diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/vcl/inc/vcl/popupmenuwindow.hxx index 57b7747ff9e5..a5856dca4bf9 100644 --- a/vcl/inc/vcl/popupmenuwindow.hxx +++ b/vcl/inc/vcl/popupmenuwindow.hxx @@ -34,6 +34,9 @@ public: sal_uInt16 GetMenuStackLevel() const; void SetMenuStackLevel( sal_uInt16 nLevel ); bool IsPopupMenu() const; + + //determine if a given window is an activated PopupMenuFloatingWindow + static bool isPopupMenu(const Window *pWindow); }; #endif diff --git a/vcl/source/window/popupmenuwindow.cxx b/vcl/source/window/popupmenuwindow.cxx index e5e773a262e9..7a037943d666 100644 --- a/vcl/source/window/popupmenuwindow.cxx +++ b/vcl/source/window/popupmenuwindow.cxx @@ -67,4 +67,10 @@ bool PopupMenuFloatingWindow::IsPopupMenu() const return mpImplData->mnMenuStackLevel != ::std::numeric_limits<sal_uInt16>::max(); } +bool PopupMenuFloatingWindow::isPopupMenu(const Window *pWindow) +{ + const PopupMenuFloatingWindow* pChild = dynamic_cast<const PopupMenuFloatingWindow*>(pWindow); + return pChild && pChild->IsPopupMenu(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 6767fde3701b..7ddb6b16a2cb 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -48,6 +48,7 @@ #include "vcl/unowrap.hxx" #include "vcl/gdimtf.hxx" #include "vcl/pdfextoutdevdata.hxx" +#include "vcl/popupmenuwindow.hxx" #include "vcl/lazydelete.hxx" #include "vcl/virdev.hxx" @@ -8601,10 +8602,15 @@ Window* Window::GetAccessibleParentWindow() const pWorkWin = pWorkWin->mpWindowImpl->mpNext; pParent = pWorkWin; } - // If this a floating window which has a native boarder window, this one should be reported as - // accessible parent + // If this is a floating window which has a native border window, then that border should be reported as + // the accessible parent, unless the floating window is a PopupMenuFloatingWindow + // + // The logic here has to match that of AccessibleFactory::createAccessibleContext in + // accessibility/source/helper/acc_factory.cxx to avoid PopupMenuFloatingWindow + // becoming a11y parents of themselves else if( GetType() == WINDOW_FLOATINGWINDOW && - mpWindowImpl->mpBorderWindow && mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) + mpWindowImpl->mpBorderWindow && mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame && + !PopupMenuFloatingWindow::isPopupMenu(this)) { pParent = mpWindowImpl->mpBorderWindow; } |