summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-04 17:28:40 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-05 10:21:54 +0200
commit8cafd08278c0b925aac91ea94d8f907d98f07047 (patch)
tree1c2b0e57c895511fdc67f8063647cc520ef5eaeb /vcl/source/app
parent3363f828d63775a11073276dce927b9538b57be6 (diff)
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/help.cxx4
-rw-r--r--vcl/source/app/idlemgr.cxx4
2 files changed, 2 insertions, 6 deletions
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 68bb91ed5c7b..1180100ba9a4 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -424,7 +424,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode )
maShowTimer.Start();
}
-IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer)
+IMPL_LINK_TYPED( HelpTextWindow, TimerHdl, Timer*, pTimer, void)
{
if ( pTimer == &maShowTimer )
{
@@ -442,8 +442,6 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer)
DBG_ASSERT( pTimer == &maHideTimer, "HelpTextWindow::TimerHdl with bad Timer" );
ImplDestroyHelpWindow( true );
}
-
- return 1;
}
Size HelpTextWindow::CalcOutSize() const
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index 5fa5bef1c340..9463acd5b021 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -104,7 +104,7 @@ void ImplIdleMgr::RemoveIdleHdl( const Link<>& rLink )
maTimer.Stop();
}
-IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl)
+IMPL_LINK_NOARG_TYPED(ImplIdleMgr, TimeoutHdl, Timer *, void)
{
for ( size_t i = 0; i < mpIdleList->size(); ++i ) {
ImplIdleData* pIdleData = (*mpIdleList)[ i ];
@@ -120,8 +120,6 @@ IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl)
}
}
}
-
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */