summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-04-15 12:01:49 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-04-15 12:01:49 +0000
commited5e339d9b85e427b3aad98484002454adbe0507 (patch)
tree787d0f0acc1c5efba6d2f6ca8788d532603107b1 /accessibility
parent4268be924219ff79d136a888697084d4481af589 (diff)
INTEGRATION: CWS aqua11y01 (1.3.26); FILE MERGED
2008/02/20 11:18:54 obr 1.3.26.4: corrected bad fix for WaE on Windows 2008/02/20 09:10:01 obr 1.3.26.3: build fix for wntmsci11 2008/02/19 09:38:27 obr 1.3.26.2: RESYNC: (1.3-1.4); FILE MERGED 2008/01/14 21:11:25 obr 1.3.26.1: #i82877# new subclass of vclxaccessiblecomponent which exposes SUB_WINDOW_OF relation for FloatingWindow(s)
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/source/helper/acc_factory.cxx22
1 files changed, 21 insertions, 1 deletions
diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index 8434e1be210f..5c8b742db53c 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: acc_factory.cxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
* This file is part of OpenOffice.org.
*
@@ -73,9 +73,21 @@
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
+#include <floatingwindowaccessible.hxx>
+
//........................................................................
namespace accessibility
{
+
+inline bool hasFloatingChild(Window *pWindow)
+{
+ Window * pChild = pWindow->GetAccessibleChildWindow(0);
+ if( pChild && WINDOW_FLOATINGWINDOW == pChild->GetType() )
+ return true;
+
+ return false;
+}
+
//........................................................................
using namespace ::com::sun::star::uno;
@@ -358,6 +370,14 @@ namespace accessibility
{
xContext = new VCLXAccessibleTabPageWindow( _pXWindow );
}
+ else if ( nType == WINDOW_FLOATINGWINDOW )
+ {
+ xContext = new FloatingWindowAccessible( _pXWindow );
+ }
+ else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) )
+ {
+ xContext = new FloatingWindowAccessible( _pXWindow );
+ }
else if ( nType == WINDOW_HELPTEXTWINDOW )
{
xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow );