diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 14:33:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 14:33:57 +0000 |
| commit | 55bb06ddc43aee6f4a714598aaa97840ad01f284 (patch) | |
| tree | 8b63ba957228ef1e5bc9ac49ea371fe38597e5a6 /desktop/source/deployment/gui/dp_gui_theextmgr.cxx | |
| parent | a051dd4ba736d990c9a42c5a1ff11d2c37645e52 (diff) | |
INTEGRATION: CWS extmgrui05 (1.2.52); FILE MERGED
2008/07/01 13:49:13 dv 1.2.52.2: #i91241# Bring dialog to front, when trying to quit while working
2008/07/01 10:14:10 dv 1.2.52.1: #i91241# Don't allow termination, when ExtMgr is working
Diffstat (limited to 'desktop/source/deployment/gui/dp_gui_theextmgr.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 553ac00ed9ff..df29c63a3c57 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -8,7 +8,7 @@ * * $RCSfile: dp_gui_theextmgr.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * * This file is part of OpenOffice.org. * @@ -394,9 +394,13 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt ) void TheExtensionManager::queryTermination( ::lang::EventObject const & ) throw ( frame::TerminationVetoException, uno::RuntimeException ) { -/* throw frame::TerminationVetoException( - OUSTR("The office cannot be closed while the Extension Manager is running"), - uno::Reference<XInterface>(static_cast<frame::XTerminateListener*>(this), UNO_QUERY));*/ + if ( m_pExecuteCmdQueue->isBusy() ) + { + ToTop( TOTOP_RESTOREWHENMIN ); + throw frame::TerminationVetoException( + OUSTR("The office cannot be closed while the Extension Manager is running"), + uno::Reference<XInterface>(static_cast<frame::XTerminateListener*>(this), uno::UNO_QUERY)); + } } //------------------------------------------------------------------------------ |