summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-04-15 12:25:13 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-04-15 12:25:13 +0000
commit7be330d0a08aca0446c570e6c9b8bddc4d339fcf (patch)
tree460c6c28a3b0f596972445ed7fbcb884b248eab8 /vcl/source
parent0aba32e130cea0779c613be756c9fdbaddaa6f5c (diff)
INTEGRATION: CWS aqua11y01 (1.61.40); FILE MERGED
2008/02/19 09:39:42 obr 1.61.40.3: RESYNC: (1.62-1.63); FILE MERGED 2008/01/23 09:34:46 obr 1.61.40.2: RESYNC: (1.61-1.62); FILE MERGED 2008/01/14 21:16:38 obr 1.61.40.1: #i82877# use dedicated subclass of vclxaccessiblecomponent for the listbox/combobox floater
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/control/ilstbox.cxx23
1 files changed, 14 insertions, 9 deletions
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index c4c18ffef8d9..6f74f48c28f9 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: ilstbox.cxx,v $
- * $Revision: 1.65 $
+ * $Revision: 1.66 $
*
* This file is part of OpenOffice.org.
*
@@ -50,7 +50,9 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#endif
-
+#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#endif
using namespace ::com::sun::star;
@@ -2871,15 +2873,18 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) :
mnPopupModeStartSaveSelection = LISTBOX_ENTRY_NOTFOUND;
EnableSaveBackground();
-}
-// -----------------------------------------------------------------------
+ Window * pBorderWindow = ImplGetBorderWindow();
+ if( pBorderWindow )
+ {
+ SetAccessibleRole(accessibility::AccessibleRole::PANEL);
+ pBorderWindow->SetAccessibleRole(accessibility::AccessibleRole::WINDOW);
+ }
+ else
+ {
+ SetAccessibleRole(accessibility::AccessibleRole::WINDOW);
+ }
-uno::Reference< ::com::sun::star::accessibility::XAccessible > ImplListBoxFloatingWindow::CreateAccessible()
-{
- // Hide Accessible for this Window, because it's a top window we don't want to see as a top window.
- // Must be handled in the ListBox/ComboBox Accessibility Implementation
- return NULL;
}
// -----------------------------------------------------------------------