diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-11-18 07:24:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-18 07:24:15 +0000 |
| commit | 8fc3fe99c8f98853bee4795db7db28b697b69d69 (patch) | |
| tree | 906f1163e99689d81d8869de6ec8cd66aec9c341 /desktop/source/deployment/gui/dp_gui_theextmgr.cxx | |
| parent | 0746817c7bb5687dd6513ba31637df9cdff832d0 (diff) | |
CWS-TOOLING: integrate CWS extmgrui06
2008-10-30 15:46:52 +0100 hr r262831 : CWS-TOOLING: rebase CWS extmgrui06 to trunk@262620 (milestone: DEV300:m34)
2008-10-22 11:19:35 +0200 dv r262586 : #i80640# mirgate CWS extmgrui06 to SVN
2008-10-22 11:19:03 +0200 dv r262585 : #i80640# mirgate CWS extmgrui06 to SVN
Diffstat (limited to 'desktop/source/deployment/gui/dp_gui_theextmgr.cxx')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index df29c63a3c57..721d67c8f35b 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.3 $ + * $Revision: 1.3.14.2 $ * * This file is part of OpenOffice.org. * @@ -281,7 +281,6 @@ void TheExtensionManager::createPackageList() if ( ! createPackageList( m_sPackageManagers[i] ) ) break; } - m_pDialog->selectEntry( 0 ); } //------------------------------------------------------------------------------ @@ -394,13 +393,15 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt ) void TheExtensionManager::queryTermination( ::lang::EventObject const & ) throw ( frame::TerminationVetoException, uno::RuntimeException ) { - if ( m_pExecuteCmdQueue->isBusy() ) + if ( m_pExecuteCmdQueue->isBusy() || ( m_pDialog && m_pDialog->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)); } + else if ( m_pDialog ) + m_pDialog->Close(); } //------------------------------------------------------------------------------ |