diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-15 17:12:00 +0000 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-02-25 12:22:16 +0000 |
| commit | b1bc16f5b342ac9c54201cfd30de3ea87bc20538 (patch) | |
| tree | de8c33dd5cd75c139de9ae7903d78b5489b9cbba /vcl | |
| parent | 90ef7668265e7187d61842ec8950aa91770a53da (diff) | |
Resolves: rhbz#895196 sc filter float a11y parent of itself loop/recurse
Change-Id: I3679e7cfcd32a78b40c6a7b803c92ff0abe6f32c
(cherry picked from commit 1b13c952f50aab2b907dab13395ab23d0955c238)
Reviewed-on: https://gerrit.libreoffice.org/2261
Reviewed-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl')
| -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 |
3 files changed, 18 insertions, 3 deletions
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 bf7da997cf5a..05d979a98f72 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -47,6 +47,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" @@ -8635,10 +8636,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; } |