diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-02 17:53:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-04 06:31:16 +0000 |
| commit | 5338d2abe4078626d2cfa38cde99dfa1d4eb2f6b (patch) | |
| tree | ed8354745a9761a75f10c310c569d828bacbab6b /avmedia | |
| parent | bb1dcd35f350e2375f6a8a9d27b02fb5784a476f (diff) | |
convert Link<> to typed
Change-Id: I4d6c37e82a5b96c09b989df248f94f0afe228b46
Reviewed-on: https://gerrit.libreoffice.org/18305
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/inc/mediacontrol.hxx | 6 | ||||
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 9e91b1b0816b..521cd9869942 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -79,9 +79,9 @@ private: void implUpdateTimeField( double fCurTime ); Image implGetImage( sal_Int32 nImageId ) const; - DECL_LINK( implTimeHdl, Slider* ); - DECL_LINK( implTimeEndHdl, Slider* ); - DECL_LINK( implVolumeHdl, Slider* ); + DECL_LINK_TYPED( implTimeHdl, Slider*, void ); + DECL_LINK_TYPED( implTimeEndHdl, Slider*, void ); + DECL_LINK_TYPED( implVolumeHdl, Slider*, void ); DECL_LINK_TYPED( implSelectHdl, ToolBox*, void ); DECL_LINK( implZoomSelectHdl, ListBox* ); DECL_LINK_TYPED(implTimeoutHdl, Idle *, void); diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 137a79524df7..e5b58a8c00b4 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -439,18 +439,16 @@ Image MediaControl::implGetImage( sal_Int32 nImageId ) const -IMPL_LINK( MediaControl, implTimeHdl, Slider*, p ) +IMPL_LINK_TYPED( MediaControl, implTimeHdl, Slider*, p, void ) { mbLocked = true; maIdle.Stop(); implUpdateTimeField( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE ); - - return 0; } -IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p ) +IMPL_LINK_TYPED( MediaControl, implTimeEndHdl, Slider*, p, void ) { MediaItem aExecItem; @@ -459,21 +457,17 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p ) update(); maIdle.Start(); mbLocked = false; - - return 0; } -IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) +IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void ) { MediaItem aExecItem; aExecItem.setVolumeDB( static_cast< sal_Int16 >( p->GetThumbPos() ) ); execute( aExecItem ); update(); - - return 0; } |