diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:28:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 10:21:54 +0200 |
| commit | 8cafd08278c0b925aac91ea94d8f907d98f07047 (patch) | |
| tree | 1c2b0e57c895511fdc67f8063647cc520ef5eaeb /avmedia | |
| parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) | |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/opengl/oglplayer.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/opengl/oglplayer.hxx | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 8bc513bb9592..75caec60ae92 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -357,7 +357,7 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames() return aRet; } -IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer) +IMPL_LINK_TYPED(OGLPlayer,TimerHandler,Timer*,pTimer,void) { if (pTimer == &m_aTimer) { @@ -365,8 +365,6 @@ IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer) assert(m_pOGLWindow); m_pOGLWindow->update(); } - - return 0; } } // namespace ogl diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index e7a4ecce98b1..605233d47f92 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -62,7 +62,7 @@ public: virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - DECL_LINK( TimerHandler, Timer* ); + DECL_LINK_TYPED( TimerHandler, Timer*, void ); OUString m_sURL; |