When creating an accessible object for a border window, create one from the child window instance unless it's a menu popup.

1 files changed, 12 insertions, 1 deletions

diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 5c8b742db53c..ba36bef7f065 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -376,7 +376,18 @@ inline bool hasFloatingChild(Window *pWindow)
             }
             else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
             {
-                xContext = new FloatingWindowAccessible( _pXWindow );
+                // TODO: better way to handle this?
+                Window* pChild = pWindow->GetAccessibleChildWindow(0);
+                if ( pChild->IsMenuFloatingWindow() )
+                    // Menu popup window handles accessibility differently.
+                    xContext = new FloatingWindowAccessible( _pXWindow );
+                else
+                {
+                    // Get the accessible context from the child window.
+                    Reference<XAccessible> xAccessible = pChild->CreateAccessible();
+                    if (xAccessible.is())
+                        xContext = xAccessible->getAccessibleContext();
+                }
             }
             else if ( nType == WINDOW_HELPTEXTWINDOW )
             {