4 files changed, 16 insertions, 10 deletions
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index cf72edc9d2a2..d567c2099b22 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -118,12 +118,12 @@ void SAL_CALL ShellStackGuard::disposing (
         }
 }
 
-IMPL_LINK(ShellStackGuard, TimeoutHandler, Timer*, pTimer)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle)
 {
 #ifdef DEBUG
-    OSL_ASSERT(pTimer==&maPrinterPollingIdle);
+    OSL_ASSERT(pIdle==&maPrinterPollingIdle);
 #else
-    (void)pTimer;
+    (void)pIdle;
 #endif
     if (mpUpdateLock.get() != NULL)
     {
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 22aaaa732045..c41158cf56f6 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -86,7 +86,7 @@ private:
     ::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock;
     Idle maPrinterPollingIdle;
 
-    DECL_LINK(TimeoutHandler, Timer*);
+    DECL_LINK(TimeoutHandler, Idle*);
 
     /** Return <TRUE/> when the printer is printing.  Return <FALSE/> when
         the printer is not printing, or there is no printer, or something
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 );