[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - accessibility/source vcl/inc vcl/source

[Caolán McNamara]

 accessibility/source/helper/acc_factory.cxx |    8 +++++---
 vcl/inc/vcl/popupmenuwindow.hxx             |    3 +++
 vcl/source/window/popupmenuwindow.cxx       |    6 ++++++
 vcl/source/window/window.cxx                |   12 +++++++++---
 4 files changed, 23 insertions(+), 6 deletions(-)

New commits:
commit b1bc16f5b342ac9c54201cfd30de3ea87bc20538
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 15 17:12:00 2013 +0000

    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 at redhat.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index dc16fe6..93f6bf5 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 57b7747..a5856dc 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 e5e773a..7a03794 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 bf7da99..05d979a 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;
     }