diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 12:54:10 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-06-09 12:54:10 +0000 |
| commit | 00fc276fdea0fb0a9ba380de33651a5c3503c5e4 (patch) | |
| tree | 6e59e97eb6586d3fce9a4666f092c6ec69c7c064 /sfx2/source/appl/newhelp.cxx | |
| parent | 127304cce5c0ab3f0287efc3b51d3f82ac44bd97 (diff) | |
INTEGRATION: CWS helpfixes1 (1.110.50); FILE MERGED
2005/06/03 08:26:13 pb 1.110.50.1: fix: #i49350# SfxHelpIndexWindow_Impl: only one Initialize()
Diffstat (limited to 'sfx2/source/appl/newhelp.cxx')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index c3a08e2ad3e0..3b59c3f24e89 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: newhelp.cxx,v $ * - * $Revision: 1.110 $ + * $Revision: 1.111 $ * - * last change: $Author: rt $ $Date: 2005-04-01 16:15:47 $ + * last change: $Author: hr $ $Date: 2005-06-09 13:54:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1710,7 +1710,9 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* _pParent ) pCPage ( NULL ), pIPage ( NULL ), pSPage ( NULL ), - pBPage ( NULL ) + pBPage ( NULL ), + + bIsInitDone ( false ) { FreeResource(); @@ -1784,7 +1786,7 @@ void SfxHelpIndexWindow_Impl::Initialize() void SfxHelpIndexWindow_Impl::SetActiveFactory() { DBG_ASSERT( pIPage, "index page not initialized" ); - if ( !aActiveLB.GetEntryCount() ) + if ( !bIsInitDone && !aActiveLB.GetEntryCount() ) { aTimer.Stop(); InitHdl( NULL ); @@ -1867,6 +1869,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, SelectHdl, ListBox *, EMPTYARG ) IMPL_LINK( SfxHelpIndexWindow_Impl, InitHdl, Timer *, EMPTYARG ) { + bIsInitDone = true; Initialize(); // now use the timer for selection |