From 05cb89cdd8db720aadedb45f3e8dae87a224fca6 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 27 Jun 2007 14:16:54 +0000
Subject: INTEGRATION: CWS a11ysep (1.23.26); FILE MERGED 2006/10/05 11:30:13
 fs 1.23.26.4: #i10000# 2006/09/21 21:32:18 fs 1.23.26.3: RESYNC: (1.24-1.29);
 FILE MERGED 2005/09/27 06:33:57 fs 1.23.26.2: RESYNC: (1.23-1.24); FILE
 MERGED 2005/03/07 08:04:24 fs 1.23.26.1: #i44293# A11Y implementations now
 provided by a factory (implemented in accessibility module)

---
 toolkit/source/helper/unowrapper.cxx | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 0e8cf01617d6..a97d27810368 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unowrapper.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: hr $ $Date: 2007-06-27 12:23:54 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 15:16:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -53,12 +53,6 @@
 #include <toolkit/awt/vclxtopwindow.hxx>
 #include <toolkit/awt/vclxgraphics.hxx>
 
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLEMENUBAR_HXX_
-#include <toolkit/awt/vclxaccessiblemenubar.hxx>
-#endif
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLEPOPUPMENU_HXX_
-#include <toolkit/awt/vclxaccessiblepopupmenu.hxx>
-#endif
 #include "toolkit/dllapi.h"
 
 #ifndef _SV_SVAPP_HXX
@@ -167,13 +161,13 @@ UnoWrapper::UnoWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star
     mxToolkit = rxToolkit;
 }
 
-UnoWrapper::~UnoWrapper()
+void UnoWrapper::Destroy()
 {
+    delete this;
 }
 
-void UnoWrapper::Destroy()
+UnoWrapper::~UnoWrapper()
 {
-    delete this;
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit> UnoWrapper::GetVCLToolkit()
@@ -348,21 +342,8 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
     }
 }
 
+// ----------------------------------------------------------------------------
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar )
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc;
-
-    DBG_ASSERT( pMenu, "UnoWrapper::CreateAccessible: no menu!" );
-    if ( pMenu )
-    {
-        OAccessibleMenuBaseComponent* pComp;
-        if ( bIsMenuBar )
-            pComp = new VCLXAccessibleMenuBar( pMenu );
-        else
-            pComp = new VCLXAccessiblePopupMenu( pMenu );
-        pComp->SetStates();
-        xAcc = pComp;
-    }
-
-    return xAcc;
+    return maAccessibleFactoryAccess.getFactory().createAccessible( pMenu, bIsMenuBar );
 }
-- 
cgit