Kaydet (Commit) 01e4920c authored tarafından Carsten Driesner's avatar Carsten Driesner

#104113# Call remove listener on menu manager before release reference

üst 08f177a0
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: menudispatcher.cxx,v $ * $RCSfile: menudispatcher.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: mba $ $Date: 2002-10-07 10:19:58 $ * last change: $Author: cd $ $Date: 2002-10-10 08:24:16 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -555,6 +555,9 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR ...@@ -555,6 +555,9 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR
if ( m_pMenuManager->GetMenu() == (Menu *)pSysWindow->GetMenuBar() ) if ( m_pMenuManager->GetMenu() == (Menu *)pSysWindow->GetMenuBar() )
pSysWindow->SetMenuBar( NULL ); pSysWindow->SetMenuBar( NULL );
// remove listener before we destruct ourself, so we cannot be called back afterwards
m_pMenuManager->RemoveListener();
SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)m_pMenuManager )->release(); SAL_STATIC_CAST( ::com::sun::star::uno::XInterface*, (OWeakObject*)m_pMenuManager )->release();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment