#100605# at the window free the reference to the accessible component

1 files changed, 11 insertions, 2 deletions

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 635d697d0821..4671cf101195 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: menu.cxx,v $
  *
- *  $Revision: 1.59 $
+ *  $Revision: 1.60 $
  *
- *  last change: $Author: tbe $ $Date: 2002-07-10 18:09:10 $
+ *  last change: $Author: tbe $ $Date: 2002-07-11 11:12:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -624,6 +624,10 @@ Menu::~Menu()
 
     ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
 
+    // at the window free the reference to the accessible component
+    if ( pWindow )
+        pWindow->SetAccessible( ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible >() );
+
     // dispose accessible components
     if ( mxAccessible.is() )
     {
@@ -2712,6 +2716,7 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nSt
 
 MenuFloatingWindow::~MenuFloatingWindow()
 {
+    // free the reference to the accessible component
     SetAccessible( ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible >() );
 
     if( Application::GetAccessHdlCount() )
@@ -3760,6 +3765,7 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
 
 MenuBarWindow::~MenuBarWindow()
 {
+    // free the reference to the accessible component
     SetAccessible( ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible >() );
 }
 
@@ -3786,6 +3792,9 @@ void MenuBarWindow::SetMenu( MenuBar* pMen )
         // notify listeners, that a new menubar was set
         ImplCallEventListeners( VCLEVENT_WINDOW_MENUBAR, (void*) pMen );
 
+        // free the reference to the accessible component
+        SetAccessible( ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessible >() );
+
         // access bridge must be notified about the addition of the new accessible menu context by an ACCESSIBLE_CHILD_EVENT
         ImplCallEventListeners( VCLEVENT_WINDOW_SHOW, this );
     }