diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:06:53 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 14:06:53 +0000 |
| commit | 3222eaa80540e1d2ead260fada642ba7e60bb10a (patch) | |
| tree | ea64ec1554c1781b5a4e39a17a7dbd7ba3213ac4 /framework | |
| parent | 53ab557de61525250ee7648eee947fff10ef911d (diff) | |
INTEGRATION: CWS fwk54 (1.5.14); FILE MERGED
2006/11/10 14:11:10 cd 1.5.14.2: RESYNC: (1.5-1.6); FILE MERGED
2006/11/10 12:56:38 cd 1.5.14.1: #i65187# Extended base class and adapt popup menu controllers to be testtool compliant
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 93ed5d0d7358..fc7819a41f21 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -4,9 +4,9 @@ * * $RCSfile: controlmenucontroller.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-10-12 10:43:06 $ + * last change: $Author: kz $ $Date: 2006-12-13 15:06:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -336,6 +336,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run ResetableGuard aLock( m_aLock ); m_xFrame.clear(); m_xDispatch.clear(); + m_xServiceManager.clear(); if ( m_xPopupMenu.is() ) m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY )); @@ -407,7 +408,7 @@ void SAL_CALL ControlMenuController::select( const css::awt::MenuEvent& rEvent ) ResetableGuard aLock( m_aLock ); xPopupMenu = m_xPopupMenu; - xRefDispatch = m_xDispatch; + xRefDispatch = m_xDispatch; xServiceManager = m_xServiceManager; aLock.unlock(); @@ -481,6 +482,9 @@ void SAL_CALL ControlMenuController::setPopupMenu( const Reference< css::awt::XP { ResetableGuard aLock( m_aLock ); + if ( m_bDisposed ) + throw DisposedException(); + if ( m_xFrame.is() && !m_xPopupMenu.is() ) { // Create popup menu on demand @@ -523,6 +527,9 @@ void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star:: { ResetableGuard aLock( m_aLock ); + if ( m_bDisposed ) + throw DisposedException(); + if ( m_xFrame.is() && m_xPopupMenu.is() ) { URL aTargetURL; |