mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert Link<> to typed

Browse Source 
Change-Id: I4d6c37e82a5b96c09b989df248f94f0afe228b46
Reviewed-on: https://gerrit.libreoffice.org/18305
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2015-09-02 17:53:43 +02:00
parent bb1dcd35f3
commit 5338d2abe4
7 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
avmedia/inc/mediacontrol.hxx
View File

@@ -79,9 +79,9 @@ private:
void implUpdateTimeField( double fCurTime ); void implUpdateTimeField( double fCurTime );
Image implGetImage( sal_Int32 nImageId ) const; Image implGetImage( sal_Int32 nImageId ) const;
DECL_LINK( implTimeHdl, Slider* ); DECL_LINK_TYPED( implTimeHdl, Slider*, void );
DECL_LINK( implTimeEndHdl, Slider* ); DECL_LINK_TYPED( implTimeEndHdl, Slider*, void );
DECL_LINK( implVolumeHdl, Slider* ); DECL_LINK_TYPED( implVolumeHdl, Slider*, void );
DECL_LINK_TYPED( implSelectHdl, ToolBox*, void ); DECL_LINK_TYPED( implSelectHdl, ToolBox*, void );
DECL_LINK( implZoomSelectHdl, ListBox* ); DECL_LINK( implZoomSelectHdl, ListBox* );
DECL_LINK_TYPED(implTimeoutHdl, Idle *, void); DECL_LINK_TYPED(implTimeoutHdl, Idle *, void);

12
avmedia/source/framework/mediacontrol.cxx
View File

@@ -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; mbLocked = true;
maIdle.Stop(); maIdle.Stop();
implUpdateTimeField( p->GetThumbPos() * maItem.getDuration() / AVMEDIA_TIME_RANGE ); 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; MediaItem aExecItem;
@@ -459,21 +457,17 @@ IMPL_LINK( MediaControl, implTimeEndHdl, Slider*, p )
update(); update();
maIdle.Start(); maIdle.Start();
mbLocked = false; mbLocked = false;
return 0;
} }
IMPL_LINK( MediaControl, implVolumeHdl, Slider*, p ) IMPL_LINK_TYPED( MediaControl, implVolumeHdl, Slider*, p, void )
{ {
MediaItem aExecItem; MediaItem aExecItem;
aExecItem.setVolumeDB( static_cast< sal_Int16 >( p->GetThumbPos() ) ); aExecItem.setVolumeDB( static_cast< sal_Int16 >( p->GetThumbPos() ) );
execute( aExecItem ); execute( aExecItem );
update(); update();
return 0;
} }

2
include/svx/sidebar/AreaPropertyPanelBase.hxx
View File

@@ -164,7 +164,7 @@ protected:
DECL_LINK(SelectFillAttrHdl, ListBox* ); DECL_LINK(SelectFillAttrHdl, ListBox* );
DECL_LINK(ChangeTrgrTypeHdl_Impl, void*); DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
DECL_LINK(ModifyTransparentHdl_Impl, void*); DECL_LINK(ModifyTransparentHdl_Impl, void*);
DECL_LINK(ModifyTransSliderHdl, void*); DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void);
// for transparency gradient // for transparency gradient
VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent); VclPtr<PopupControl> CreateTransparencyGradientControl (PopupContainer* pParent);

8
include/vcl/slider.hxx
View File

@@ -55,8 +55,8 @@ private:
VclPtr<NumericField> mpLinkedField; VclPtr<NumericField> mpLinkedField;
Link<> maSlideHdl; Link<Slider*,void> maSlideHdl;
Link<> maEndSlideHdl; Link<Slider*,void> maEndSlideHdl;
DECL_LINK(LinkedFieldModifyHdl, NumericField*); DECL_LINK(LinkedFieldModifyHdl, NumericField*);
@@ -112,8 +112,8 @@ public:
void SetLinkedField(VclPtr<NumericField> pField); void SetLinkedField(VclPtr<NumericField> pField);
void SetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; } void SetSlideHdl( const Link<Slider*,void>& rLink ) { maSlideHdl = rLink; }
void SetEndSlideHdl( const Link<>& rLink ) { maEndSlideHdl = rLink; } void SetEndSlideHdl( const Link<Slider*,void>& rLink ) { maEndSlideHdl = rLink; }
}; };
#endif // INCLUDED_VCL_SLIDER_HXX #endif // INCLUDED_VCL_SLIDER_HXX

4
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
View File

@@ -1148,14 +1148,12 @@ void AreaPropertyPanelBase::Update()
} }
} }
IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransSliderHdl) IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void)
{ {
const sal_uInt16 nVal = mpSldTransparent->GetThumbPos(); const sal_uInt16 nVal = mpSldTransparent->GetThumbPos();
SetTransparency(nVal); SetTransparency(nVal);
const XFillTransparenceItem aLinearItem(nVal); const XFillTransparenceItem aLinearItem(nVal);
setFillTransparence(aLinearItem); setFillTransparence(aLinearItem);
return 0L;
} }
IMPL_LINK_TYPED( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) IMPL_LINK_TYPED( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void )

3
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
View File

@@ -166,13 +166,12 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransMetricHdl)
return 0; return 0;
} }
IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransSliderHdl) IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void)
{ {
sal_uInt16 nVal = mpShadowTransSlider->GetThumbPos(); sal_uInt16 nVal = mpShadowTransSlider->GetThumbPos();
SetTransparencyValue(nVal); SetTransparencyValue(nVal);
SdrPercentItem aItem( makeSdrShadowTransparenceItem(nVal) ); SdrPercentItem aItem( makeSdrShadowTransparenceItem(nVal) );
GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_TRANSPARENCE, SfxCallMode::RECORD, &aItem, 0L); GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_TRANSPARENCE, SfxCallMode::RECORD, &aItem, 0L);
return 0;
} }
IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl) IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl)

2
svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
View File

@@ -85,7 +85,7 @@ private:
DECL_LINK(ModifyShadowColorHdl, void*); DECL_LINK(ModifyShadowColorHdl, void*);
DECL_LINK(ModifyShadowTransMetricHdl, void*); DECL_LINK(ModifyShadowTransMetricHdl, void*);
DECL_LINK(ModifyShadowDistanceHdl, void*); DECL_LINK(ModifyShadowDistanceHdl, void*);
DECL_LINK(ModifyShadowTransSliderHdl, void*); DECL_LINK_TYPED(ModifyShadowTransSliderHdl, Slider*, void);
}; };
} }
} }