diff options
| author | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-10 11:01:48 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-10 12:06:42 +0000 |
| commit | d1577ee1ed215d9d4adfcdc0a71e2cfec0f3ebda (patch) | |
| tree | 27c1a2b486bf7d4175bde3ad5c7da8c19922f0d0 /sfx2 | |
| parent | 861e7853e3b98b0adf5a72c88e2bf8c16ca17d09 (diff) | |
priorities: prevent future compatibility problems
Change-Id: I735bac570a0bed35d9ddc07e5f107fb696b49082
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 15 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 77265a2bfa41..cdad56376365 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -538,7 +538,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) ); Link aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl ); - aFactoryIdle.SetIdleHdl( aTimeoutLink ); + aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl )); aFactoryIdle.SetPriority(VCL_IDLE_PRIORITY_LOWER); aKeywordTimer.SetTimeoutHdl( aTimeoutLink ); } @@ -708,12 +708,17 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl) return 0; } -IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer ) +IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle ) { - if ( &aFactoryIdle == pTimer ) + if ( &aFactoryIdle == pIdle ) InitializeIndex(); - else if ( &aKeywordTimer == pTimer && !sKeyword.isEmpty() ) - aKeywordLink.Call( this ); + return 0; +} + +IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer) +{ + if(&aKeywordTimer == pTimer && !sKeyword.isEmpty()) + aKeywordLink.Call(this); return 0; } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index e3f5202872c3..95b879438614 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -134,7 +134,8 @@ private: void ClearIndex(); DECL_LINK(OpenHdl, void *); - DECL_LINK( TimeoutHdl, Timer* ); + DECL_LINK(IdleHdl, Idle* ); + DECL_LINK(TimeoutHdl, Timer*); public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); |