diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-06 16:30:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-06 16:30:03 +0000 |
| commit | 32a11c5c055cde4e50b4b1dbeaf6a1b355a8eeb1 (patch) | |
| tree | 863bc9996d8728add21cbd9c911e4a36fb3e8257 /extensions/source/update/ui/updatecheckui.cxx | |
| parent | 0af82fa2a3dd3926b97550e2d92ad5a12bd0271c (diff) | |
CWS-TOOLING: integrate CWS dv05
2008-12-12 11:36:32 +0100 dv r265399 : #i93992# Reverted changes made for this issues
2008-12-11 10:22:09 +0100 dv r265252 : #i96735# the check for existance of the online update module needs to catch exceptions!
2008-12-10 13:28:32 +0100 dv r265179 : CWS-TOOLING: rebase CWS dv05 to trunk@264807 (milestone: DEV300:m37)
2008-12-09 11:38:53 +0100 dv r265069 : #i94154#: migrate CWS dv05 to SVN.
Diffstat (limited to 'extensions/source/update/ui/updatecheckui.cxx')
| -rw-r--r-- | extensions/source/update/ui/updatecheckui.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index d43c21982..8c673ccbc 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: updatecheckui.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.18.2 $ * * This file is part of OpenOffice.org. * @@ -595,6 +595,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow() XubString( maBubbleTitle ), XubString( maBubbleText ), maBubbleImage ); + mbBubbleChanged = false; } else if ( mbBubbleChanged ) { pBubbleWin->SetTitleAndText( XubString( maBubbleTitle ), @@ -709,13 +710,22 @@ IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG ) Window *pActiveWin = Application::GetActiveTopWindow(); SystemWindow *pActiveSysWin = NULL; - if ( pActiveWin && pActiveWin->IsTopWindow() ) + Window *pBubbleWin = NULL; + if ( mpBubbleWin ) + pBubbleWin = mpBubbleWin; + + if ( pActiveWin && ( pActiveWin != pBubbleWin ) && pActiveWin->IsTopWindow() ) pActiveSysWin = pActiveWin->GetSystemWindow(); - while ( !pActiveSysWin && pTopWin ) { - if ( pTopWin->IsTopWindow() ) + if ( pActiveWin == pBubbleWin ) + pActiveSysWin = NULL; + + while ( !pActiveSysWin && pTopWin ) + { + if ( ( pTopWin != pBubbleWin ) && pTopWin->IsTopWindow() ) pActiveSysWin = pTopWin->GetSystemWindow(); - pTopWin = Application::GetNextTopLevelWindow( pTopWin ); + if ( !pActiveSysWin ) + pTopWin = Application::GetNextTopLevelWindow( pTopWin ); } if ( pActiveSysWin ) |