diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-04 09:57:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-04 09:57:57 +0000 |
| commit | a9a6cb8d22a4d0742f3e0cbee80913084d36f312 (patch) | |
| tree | 5e32e4661cf7ed1394aa474eb64ba4766ddd6fb0 /extensions/source/update | |
| parent | bc15e9e9f6dc5788b78121ace97e4fcb2f1bf20e (diff) | |
INTEGRATION: CWS dv03 (1.16.6); FILE MERGED
2008/04/01 09:19:30 dv 1.16.6.1: #i85765# Changed RemoveBubbleWindow to always remove icon
Diffstat (limited to 'extensions/source/update')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 6cfdfa08e73d..1c8a80b21ced 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -4,9 +4,9 @@ * * $RCSfile: updatecheckui.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2008-02-25 15:35:53 $ + * last change: $Author: kz $ $Date: 2008-04-04 10:57:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -632,8 +632,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) if ( bRemoveIcon ) { try { - if ( mpIconSysWin && mpIconMBar && - ( mpIconSysWin->GetMenuBar() == mpIconMBar ) ) + if ( mpIconMBar && ( mnIconID != 0 ) ) { mpIconMBar->RemoveMenuBarButton( mnIconID ); mpIconMBar = NULL; |