4 files changed, 5 insertions, 8 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index b24e1a590ee7..b7cd9185d328 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -85,7 +85,7 @@ private:
                         DECL_LINK(implVolumeEndHdl, void *);
                         DECL_LINK( implSelectHdl, ToolBox* );
                         DECL_LINK( implZoomSelectHdl, ListBox* );
-                        DECL_LINK(implTimeoutHdl, void *);
+                        DECL_LINK_TYPED(implTimeoutHdl, Idle *, void);
 
     ImageList           maImageList;
     Idle                maIdle;
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index 5168c12e34e3..99523fe7a8ef 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -604,12 +604,10 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox*, p )
 
 
 
-IMPL_LINK_NOARG(MediaControl, implTimeoutHdl)
+IMPL_LINK_NOARG_TYPED(MediaControl, implTimeoutHdl, Idle *, void)
 {
     update();
     maIdle.Start();
-
-    return 0;
 }
 
 }
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 24e478f28bf8..3ed91fddcab6 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -299,7 +299,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::Property
     @return     0 every time... it doesn't matter for us.
     @threadsafe yes
 *//*-*************************************************************************************************************/
-IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
+IMPL_LINK_NOARG_TYPED(SoundHandler, implts_PlayerNotify, Idle *, void)
 {
     // SAFE {
     ::osl::ClearableMutexGuard aLock( m_aLock );
@@ -307,7 +307,7 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
     if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime() < m_xPlayer->getDuration())
     {
         m_aUpdateIdle.Start();
-        return 0L;
+        return;
     }
     m_xPlayer.clear();
 
@@ -333,7 +333,6 @@ IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify)
     // } SAFE
     //release aLock before end of method at which point xOperationHold goes out of scope and pThis dies
     aLock.clear();
-    return 0;
 }
 
 } // namespace framework
diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx
index 30b9b2623f08..c16592fc4590 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -110,7 +110,7 @@ class SoundHandler  :   // interfaces
 
     //  private methods
     private:
-        DECL_LINK( implts_PlayerNotify, void* );
+        DECL_LINK_TYPED( implts_PlayerNotify, Idle*, void );
 
     //  variables
     //  (should be private everyway!)