diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-15 08:55:15 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-15 08:55:15 +0000 |
| commit | cc21b9b34f326ad1df5aef383e0d8de47a00e541 (patch) | |
| tree | 2bc676b272c2bb268d88ba02e88218d92c6cef6b | |
| parent | aeb138156a4c1ef6751132fcf3f20297239f906f (diff) | |
INTEGRATION: CWS dogtags01 (1.32.206); FILE MERGED
2006/05/11 09:57:22 hdu 1.32.206.1: #i65180# add dogtags to HelpTextWindow
| -rw-r--r-- | vcl/source/app/help.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index e32609d9c3aa..ec4a6cb15ea6 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -4,9 +4,9 @@ * * $RCSfile: help.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: kz $ $Date: 2005-11-01 10:31:24 $ + * last change: $Author: vg $ $Date: 2006-05-15 09:55:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -444,12 +444,14 @@ void HelpTextWindow::SetHelpText( const String& rHelpText ) void HelpTextWindow::ImplShow() { + ImplDelData aDogTag( this ); if ( maStatusText.Len() ) { ImplSVData* pSVData = ImplGetSVData(); pSVData->mpApp->ShowHelpStatusText( maStatusText ); } Show( TRUE, SHOW_NOACTIVATE ); + if( !aDogTag.IsDelete() ) Update(); } @@ -535,14 +537,14 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) { if ( pTimer == &maShowTimer ) { - ImplShow(); if ( mnHelpWinStyle == HELPWINSTYLE_QUICK ) { - // Auto-Hide nicht bei einem Tip-Fenster (ShowTip) + // start auto-hide-timer for non-ShowTip windows ImplSVData* pSVData = ImplGetSVData(); if ( this == pSVData->maHelpData.mpHelpWin ) maHideTimer.Start(); } + ImplShow(); } else { |