diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 09:50:08 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-07-17 09:50:08 +0000 |
| commit | b9846928712cb69f6658c4a7ae8027b37cefd5a0 (patch) | |
| tree | 2f94ec1b95866869d84c6ce1ca599633c4d121ed /desktop/source/deployment | |
| parent | 9658b19ef006bf197ff688f1d26746660564577b (diff) | |
INTEGRATION: CWS dv04 (1.6.4); FILE MERGED
2008/07/14 06:28:00 dv 1.6.4.1: #i91625# Notify updates after canceling update dialog, too
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 8151a596c0..6494215ba0 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -8,7 +8,7 @@ * * $RCSfile: dp_gui_extensioncmdqueue.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -1029,9 +1029,10 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( const uno::Sequence< uno::Refe pUpdateDialog = new UpdateDialog( m_xContext, m_pDialog, rtl::Reference< SelectedPackage >(), rPackageManagers, &vData ); + pUpdateDialog->notifyMenubar( true, false ); // prepare the checking, if there updates to be notified via menu bar icon + if ( ( pUpdateDialog->Execute() == RET_OK ) && !vData.empty() ) { - pUpdateDialog->notifyMenubar( true, false ); // prepare the checking, if there updates to be notified via menu bar icon // If there is at least one directly downloadable dialog then we // open the install dialog. ::std::vector< UpdateData > dataDownload; @@ -1065,6 +1066,8 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( const uno::Sequence< uno::Refe } } } + else + pUpdateDialog->notifyMenubar( false, false ); // check if there updates to be notified via menu bar icon delete pUpdateDialog; } |