convert Link<> to typed

Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb
Reviewed-on: https://gerrit.libreoffice.org/19305
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

24 files changed, 102 insertions, 99 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index e7bbc92c5e0b..365cb5400574 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -971,7 +971,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the choice of one design
-IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 {
     const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
     m_pDesign = &m_aDesignList[nPos];
@@ -981,8 +981,6 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl)
         SetDesign(m_pDesign);
 
     UpdatePage();
-
-    return 0;
 }
 
 // Clickhandler for the delete of one design
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index de878b01b353..1d48964dc4bc 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -176,7 +176,7 @@ public:
     bool select( const OUString& rsPresetId );
 
 private:
-    DECL_LINK( implSelectHdl, Control* );
+    DECL_LINK_TYPED( implSelectHdl, ListBox&, void );
     DECL_LINK_TYPED( implDoubleClickHdl, CategoryListBox&, void );
 
     void onSelectEffect();
@@ -307,11 +307,10 @@ void CustomAnimationCreateTabPage::dispose()
     TabPage::dispose();
 }
 
-IMPL_LINK( CustomAnimationCreateTabPage, implSelectHdl, Control*, pControl )
+IMPL_LINK_TYPED( CustomAnimationCreateTabPage, implSelectHdl, ListBox&, rControl, void )
 {
-    if( pControl == mpLBEffects )
+    if( &rControl == mpLBEffects )
         onSelectEffect();
-    return 0;
 }
 
 IMPL_LINK_TYPED( CustomAnimationCreateTabPage, implDoubleClickHdl, CategoryListBox&, rControl, void )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 831f990f64e6..278a8bc549a1 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -109,18 +109,24 @@ public:
 private:
     std::map< sal_uInt16, OUString > maPropertyValues;
     VclPtr<ListBox> mpControl;
+    DECL_LINK_TYPED(OnSelect, ListBox&, void);
+    Link<> maModifyLink;
 };
 
 PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const OUString& aPresetId, const Link<>& rModifyHdl )
-: PropertySubControl( nControlType )
+: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
 {
     mpControl = VclPtr<ListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
     mpControl->SetDropDownLineCount( 10 );
-    mpControl->SetSelectHdl( rModifyHdl );
+    mpControl->SetSelectHdl( LINK(this, PresetPropertyBox, OnSelect) );
     mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX );
 
     setValue( rValue, aPresetId );
+}
 
+IMPL_LINK_TYPED(PresetPropertyBox, OnSelect, ListBox&, rListBox, void)
+{
+    maModifyLink.Call(&rListBox);
 }
 
 void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
@@ -185,14 +191,16 @@ public:
 
 private:
     VclPtr<ColorListBox> mpControl;
+    DECL_LINK_TYPED(OnSelect, ListBox&, void);
+    Link<> maModifyLink;
 };
 
 ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<>& rModifyHdl )
-: PropertySubControl( nControlType )
+: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
 {
     mpControl = VclPtr<ColorListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
     mpControl->SetDropDownLineCount( 10 );
-    mpControl->SetSelectHdl( rModifyHdl );
+    mpControl->SetSelectHdl( LINK(this, ColorPropertyBox, OnSelect) );
     mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX );
 
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
@@ -218,6 +226,11 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
     }
 }
 
+IMPL_LINK_TYPED(ColorPropertyBox, OnSelect, ListBox&, rListBox, void)
+{
+    maModifyLink.Call(&rListBox);
+}
+
 ColorPropertyBox::~ColorPropertyBox()
 {
     mpControl.disposeAndClear();
@@ -988,8 +1001,9 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     void update( STLPropertySet* pSet );
-    DECL_LINK( implSelectHdl, Control* );
+    DECL_LINK_TYPED( implSelectHdl, ListBox&, void );
     DECL_LINK_TYPED( implClickHdl, Button*, void );
+    void implHdl(Control*);
 
 private:
     void updateControlStates();
@@ -1301,10 +1315,14 @@ void CustomAnimationEffectTabPage::updateControlStates()
 
 IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void )
 {
-    implSelectHdl(pBtn);
+    implHdl(pBtn);
+}
+IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void )
+{
+    implHdl(&rListBox);
 }
 
-IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl )
+void CustomAnimationEffectTabPage::implHdl(Control* pControl )
 {
     if( pControl == mpLBAfterEffect )
     {
@@ -1334,7 +1352,6 @@ IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, Control*, pControl )
     }
 
     updateControlStates();
-    return 0;
 }
 
 void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
@@ -1591,8 +1608,9 @@ public:
 
     void update( STLPropertySet* pSet );
 
-    DECL_LINK( implControlHdl, Control* );
+    DECL_LINK_TYPED( implControlHdl, ListBox&, void );
     DECL_LINK_TYPED( implClickHdl, Button*, void );
+    void implHdl(Control*);
 
 private:
     const STLPropertySet* mpSet;
@@ -1808,18 +1826,20 @@ void CustomAnimationDurationTabPage::dispose()
 
 IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void )
 {
-    implControlHdl(pBtn);
+    implHdl(pBtn);
+}
+IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implControlHdl, ListBox&, rListBox, void )
+{
+    implHdl(&rListBox);
 }
 
-IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, Control*, pControl )
+void CustomAnimationDurationTabPage::implHdl( Control* pControl )
 {
     if( pControl == mpLBTrigger )
     {
         mpRBClickSequence->Check( false );
         mpRBInteractive->Check();
     }
-
-    return 0;
 }
 
 void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
@@ -1984,7 +2004,7 @@ public:
     void update( STLPropertySet* pSet );
 
     void updateControlStates();
-    DECL_LINK(implSelectHdl, void *);
+    DECL_LINK_TYPED(implSelectHdl, ListBox&, void);
 
 private:
     VclPtr<FixedText>   maFTGroupText;
@@ -2168,10 +2188,9 @@ void CustomAnimationTextAnimTabPage::updateControlStates()
     }
 }
 
-IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl)
+IMPL_LINK_NOARG_TYPED(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, void)
 {
     updateControlStates();
-    return 0;
 }
 
 CustomAnimationDialog::CustomAnimationDialog(vcl::Window* pParent, STLPropertySet* pSet, const OString& sPage)
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 9081eafde016..463a1aac779e 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -190,8 +190,8 @@ CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,
     mpPBAddEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
     mpPBChangeEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
     mpPBRemoveEffect->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
-    mpLBStart->SetSelectHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
-    mpCBSpeed->SetSelectHdl( LINK( this, CustomAnimationPane, implControlHdl ) );
+    mpLBStart->SetSelectHdl( LINK( this, CustomAnimationPane, implControlListBoxHdl ) );
+    mpCBSpeed->SetSelectHdl( LINK( this, CustomAnimationPane, implControlListBoxHdl ) );
     mpPBPropertyMore->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
     mpPBMoveUp->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
     mpPBMoveDown->SetClickHdl( LINK( this, CustomAnimationPane, implClickHdl ) );
@@ -2020,9 +2020,13 @@ IMPL_LINK_TYPED( CustomAnimationPane, implClickHdl, Button*, pBtn, void )
 {
     implControlHdl(pBtn);
 }
+IMPL_LINK_TYPED( CustomAnimationPane, implControlListBoxHdl, ListBox&, rListBox, void )
+{
+    implControlHdl(&rListBox);
+}
 
 /// this link is called when one of the controls is modified
-IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl )
+void CustomAnimationPane::implControlHdl(Control* pControl )
 {
     if( pControl == mpPBAddEffect )
         onChange(true);
@@ -2049,8 +2053,6 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl )
     }
 
     updateControls();
-
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(CustomAnimationPane, lateInitCallback, Timer *, void)
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 33c363e76e3c..5ab1de657575 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -116,11 +116,12 @@ private:
     bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue );
     void UpdateLook();
 
-    DECL_LINK( implControlHdl, Control* );
+    DECL_LINK_TYPED( implControlListBoxHdl, ListBox&, void );
     DECL_LINK_TYPED( implClickHdl, Button*, void );
     DECL_LINK(implPropertyHdl, void *);
     DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
     DECL_LINK_TYPED(lateInitCallback, Timer *, void);
+    void implControlHdl(Control*);
 
 private:
     ViewShellBase& mrBase;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index c527ff52169a..233da3af03f9 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -998,10 +998,9 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, PlayButtonClicked, Button*, void)
     playCurrentEffect();
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, TransitionSelected, ListBox&, void)
 {
     applyToSelectedPages();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceSlideRadioButtonToggled, RadioButton&, void)
@@ -1016,13 +1015,12 @@ IMPL_LINK_NOARG(SlideTransitionPane, AdvanceTimeModified)
     return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, SpeedListBoxSelected)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, SpeedListBoxSelected, ListBox&, void)
 {
     applyToSelectedPages();
-    return 0;
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected)
+IMPL_LINK_NOARG_TYPED(SlideTransitionPane, SoundListBoxSelected, ListBox&, void)
 {
     if( mpLB_SOUND->GetSelectEntryCount() )
     {
@@ -1035,7 +1033,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected)
     }
     updateControlState();
     applyToSelectedPages();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LoopSoundBoxChecked, Button*, void)
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index 023ac54a2add..4b0e8e1c207f 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -89,11 +89,11 @@ private:
     DECL_LINK_TYPED( PlayButtonClicked, Button*, void );
     DECL_LINK_TYPED( AutoPreviewClicked, Button*, void );
 
-    DECL_LINK( TransitionSelected, void * );
+    DECL_LINK_TYPED( TransitionSelected, ListBox&, void );
     DECL_LINK_TYPED( AdvanceSlideRadioButtonToggled, RadioButton&, void );
     DECL_LINK( AdvanceTimeModified, void * );
-    DECL_LINK( SpeedListBoxSelected, void * );
-    DECL_LINK( SoundListBoxSelected, void * );
+    DECL_LINK_TYPED( SpeedListBoxSelected, ListBox&, void );
+    DECL_LINK_TYPED( SoundListBoxSelected, ListBox&, void );
     DECL_LINK_TYPED( LoopSoundBoxChecked, Button*, void );
     DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
     DECL_LINK_TYPED(LateInitCallback, Timer *, void);
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index b77e49f675a8..b349a438471b 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -576,7 +576,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
+IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
 {
     OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
     OUString sImgUrl = pData ? OUString(*pData) : "";
@@ -633,7 +633,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
         pImg->SetImage(Image());
     }
     EnableDisableButtons();
-    return 0;
 }
 
 Reference< drawing::XDrawPage > SdPhotoAlbumDialog::appendNewSlide(AutoLayout aLayout,
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index a82f0aad4f6d..1b7cf81c9d0e 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -78,7 +78,7 @@ private:
     DECL_LINK_TYPED(DownHdl, Button*, void);
     DECL_LINK_TYPED(RemoveHdl, Button*, void);
 
-    DECL_LINK(SelectHdl, void*);
+    DECL_LINK_TYPED(SelectHdl, ListBox&, void);
 
     Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout,
         Reference< drawing::XDrawPages > xDrawPages);
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 86421fde3f0c..a4bf97f08732 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -221,7 +221,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
 /**
  * enables and selects end color LB
  */
-IMPL_LINK_NOARG(CopyDlg, SelectColorHdl)
+IMPL_LINK_NOARG_TYPED(CopyDlg, SelectColorHdl, ListBox&, void)
 {
     sal_Int32 nPos = m_pLbStartColor->GetSelectEntryPos();
 
@@ -232,7 +232,6 @@ IMPL_LINK_NOARG(CopyDlg, SelectColorHdl)
         m_pLbEndColor->Enable();
         m_pFtEndColor->Enable();
     }
-    return 0;
 }
 
 /**
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index bfa142d5afcb..b926bdf80193 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -58,7 +58,7 @@ SdCustomShowDlg::SdCustomShowDlg( vcl::Window* pWindow,
     m_pBtnRemove->SetClickHdl( aLink );
     m_pBtnCopy->SetClickHdl( aLink );
     m_pCbxUseCustomShow->SetClickHdl( aLink );
-    m_pLbCustomShows->SetSelectHdl( LINK( this, SdCustomShowDlg, SelectHdl ) );
+    m_pLbCustomShows->SetSelectHdl( LINK( this, SdCustomShowDlg, SelectListBoxHdl ) );
 
     m_pBtnStartShow->SetClickHdl( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // for test
 
@@ -121,10 +121,12 @@ IMPL_LINK_TYPED( SdCustomShowDlg, ClickButtonHdl, Button *, p, void )
 {
     SelectHdl(p);
 }
-/**
- * ButtonHdl()
- */
-IMPL_LINK( SdCustomShowDlg, SelectHdl, void *, p )
+IMPL_LINK_TYPED( SdCustomShowDlg, SelectListBoxHdl, ListBox&, rListBox, void )
+{
+    SelectHdl(&rListBox);
+}
+
+void SdCustomShowDlg::SelectHdl(void *p)
 {
     // new CustomShow
     if( p == m_pBtnNew )
@@ -261,8 +263,6 @@ IMPL_LINK( SdCustomShowDlg, SelectHdl, void *, p )
     }
 
     CheckState();
-
-    return 0L;
 }
 
 // StartShow-Hdl
@@ -295,11 +295,10 @@ SdDefineCustomShowDlg::SdDefineCustomShowDlg( vcl::Window* pWindow,
     get( m_pBtnHelp, "help" );
 
     Link<Button*,void> aLink = LINK( this, SdDefineCustomShowDlg, ClickButtonHdl );
-    Link<> aLink2= LINK( this, SdDefineCustomShowDlg, ClickButtonHdl2 );
     m_pBtnAdd->SetClickHdl( aLink );
     m_pBtnRemove->SetClickHdl( aLink );
-    m_pEdtName->SetModifyHdl( aLink2 );
-    m_pLbPages->SetSelectHdl( aLink2 ); // because of status
+    m_pEdtName->SetModifyHdl( LINK( this, SdDefineCustomShowDlg, ClickButtonHdl2 ) );
+    m_pLbPages->SetSelectHdl( LINK( this, SdDefineCustomShowDlg, ClickButtonHdl4 ) ); // because of status
     m_pLbCustomPages->SetSelectHdl( LINK( this, SdDefineCustomShowDlg, ClickButtonHdl3 ) ); // because of status
 
     m_pBtnOK->SetClickHdl( LINK( this, SdDefineCustomShowDlg, OKHdl ) );
@@ -391,6 +390,10 @@ IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void
 {
     ClickButtonHdl2(p);
 }
+IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl4, ListBox&, rListBox, void )
+{
+    ClickButtonHdl2(&rListBox);
+}
 // ButtonHdl()
 IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl2, void *, p )
 {
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index c0fc28a8a63c..d372d55a92c0 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -225,22 +225,22 @@ public:
     static OUString GetUiTextForCommand (const OUString& aCommandURL);
     static Image GetUiIconForCommand (const OUString& aCommandURL);
 
-    DECL_LINK( SelectFileHdl, void * );
-    DECL_LINK( SelectRegionHdl, ListBox * );
+    DECL_LINK_TYPED( SelectFileHdl, ListBox&, void );
+    DECL_LINK_TYPED( SelectRegionHdl, ListBox&, void );
     DECL_LINK_TYPED( UpdatePreviewHdl, Idle *, void );
     DECL_LINK_TYPED( UpdatePageListHdl, Idle *, void );
     DECL_LINK_TYPED( StartTypeHdl, Button *, void );
-    DECL_LINK( SelectTemplateHdl, void * );
+    DECL_LINK_TYPED( SelectTemplateHdl, ListBox&, void);
     DECL_LINK_TYPED( NextPageHdl, Button*, void );
     DECL_LINK_TYPED( LastPageHdl, Button*, void );
     DECL_LINK_TYPED( PreviewFlagHdl, Button*, void );
     DECL_LINK_TYPED( EffectPreviewIdleHdl, Idle *, void );
     DECL_LINK_TYPED( EffectPreviewClickHdl, SdDocPreviewWin&, void );
-    DECL_LINK( SelectLayoutHdl, void * );
+    DECL_LINK_TYPED( SelectLayoutHdl, ListBox&, void );
     DECL_LINK_TYPED( PageSelectHdl, SvTreeListBox*, void );
     DECL_LINK_TYPED( PresTypeHdl, Button*, void );
     DECL_LINK( UpdateUserDataHdl, void * );
-    DECL_LINK( SelectEffectHdl, void* );
+    DECL_LINK_TYPED( SelectEffectHdl, ListBox&, void);
     DECL_LINK_TYPED( OpenButtonHdl, Button *, void );
 
     OUString            maCreateStr;
@@ -639,7 +639,7 @@ AssistentDlgImpl::AssistentDlgImpl( vcl::Window* pWindow, const Link<ListBox&,vo
             mpPage1RegionLB->SelectEntry( pStandardTemplateDir->msRegion );
             SelectTemplateRegion( pStandardTemplateDir->msRegion );
             mpPage1TemplateLB->SelectEntry( pStandardTemplateEntry->msTitle );
-            SelectTemplateHdl(mpPage1TemplateLB);
+            SelectTemplateHdl(*mpPage1TemplateLB);
         }
     }
 }
@@ -1079,26 +1079,23 @@ void AssistentDlgImpl::UpdatePage()
 // UI-Handler
 // ********************************************************************
 
-IMPL_LINK( AssistentDlgImpl, SelectRegionHdl, ListBox *, pLB )
+IMPL_LINK_TYPED( AssistentDlgImpl, SelectRegionHdl, ListBox&, rLB, void )
 {
-    if( pLB == mpPage1RegionLB )
+    if( &rLB == mpPage1RegionLB )
     {
-        SelectTemplateRegion( pLB->GetSelectEntry() );
+        SelectTemplateRegion( rLB.GetSelectEntry() );
         SetStartType( ST_TEMPLATE );
         mpPage2Medium5RB->Check();
     }
     else
     {
-        SelectLayoutRegion( pLB->GetSelectEntry() );
+        SelectLayoutRegion( rLB.GetSelectEntry() );
     }
-
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, SelectEffectHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, SelectEffectHdl, ListBox&, void)
 {
     maEffectPrevIdle.Start();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED( AssistentDlgImpl, OpenButtonHdl, Button*, void )
@@ -1142,26 +1139,23 @@ IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PreviewFlagHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, SelectTemplateHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, SelectTemplateHdl, ListBox&, void)
 {
     SetStartType( ST_TEMPLATE );
     mpPage2Medium5RB->Check();
     mpPage2LayoutLB->SelectEntryPos(0);
     maPrevIdle.Start();
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, SelectLayoutHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, SelectLayoutHdl, ListBox&, void)
 {
     maPrevIdle.Start();
-    return 0;
 }
 
-IMPL_LINK_NOARG(AssistentDlgImpl, SelectFileHdl)
+IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, SelectFileHdl, ListBox&, void)
 {
     SetStartType( ST_OPEN );
     maPrevIdle.Start();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(AssistentDlgImpl, PageSelectHdl, SvTreeListBox*, void)
@@ -1274,7 +1268,7 @@ void AssistentDlgImpl::SelectTemplateRegion( const OUString& rRegion )
             if(GetStartType() == ST_TEMPLATE)
             {
                 mpPage1TemplateLB->SelectEntryPos( 0 );
-                SelectTemplateHdl(NULL);
+                SelectTemplateHdl(*mpPage1TemplateLB);
             }
             break;
         }
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index f2c6359569a6..550ac1569909 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -312,11 +312,9 @@ void SdModifyFieldDlg::FillControls()
     m_pLbFormat->SaveValue();
 }
 
-IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl)
+IMPL_LINK_NOARG_TYPED(SdModifyFieldDlg, LanguageChangeHdl, ListBox&, void)
 {
     FillFormatList();
-
-    return 0L;
 }
 
 SfxItemSet SdModifyFieldDlg::GetItemSet()
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 1276126cb055..0cdbed14fbb6 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -146,8 +146,7 @@ private:
     bool            mbHandoutMode;
 
     DECL_LINK_TYPED( UpdateOnClickHdl, Button*, void );
-
-    DECL_LINK( LanguageChangeHdl, void * );
+    DECL_LINK_TYPED( LanguageChangeHdl, ListBox&, void );
 
     void FillFormatList(int eFormat);
     void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet );
@@ -477,11 +476,9 @@ void HeaderFooterTabPage::dispose()
     TabPage::dispose();
 }
 
-IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl)
+IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void)
 {
     FillFormatList( (int)reinterpret_cast<sal_IntPtr>(mpCBDateTimeFormat->GetSelectEntryData()) );
-
-    return 0L;
 }
 
 void HeaderFooterTabPage::FillFormatList( int eFormat )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 644250429ca9..b390066e02a3 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -425,7 +425,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
     return false;
 }
 
-IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
+IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
 {
     OUString aStrLb = maLbDocs->GetSelectEntry();
     long   nPos = maLbDocs->GetSelectEntryPos();
@@ -465,8 +465,6 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
         meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED;
         SetDragImage();
     }
-
-    return 0L;
 }
 
 /**
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 88bc1506ed69..ee4fd3d9e2ed 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -136,7 +136,7 @@ SdTPAction::SdTPAction(vcl::Window* pWindow, const SfxItemSet& rInAttrs)
     set_width_request(aSize.Width());
     set_height_request(aSize.Height());
 
-    ClickActionHdl( this );
+    ClickActionHdl( *m_pLbAction );
 }
 
 SdTPAction::~SdTPAction()
@@ -359,7 +359,7 @@ void SdTPAction::Reset( const SfxItemSet* rAttrs )
         default:
         break;
     }
-    ClickActionHdl( this );
+    ClickActionHdl( *m_pLbAction );
 
     m_pLbAction->SaveValue();
     m_pEdtSound->SaveValue();
@@ -476,7 +476,7 @@ IMPL_LINK_NOARG_TYPED(SdTPAction, ClickSearchHdl, Button*, void)
     OpenFileDialog();
 }
 
-IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
+IMPL_LINK_NOARG_TYPED(SdTPAction, ClickActionHdl, ListBox&, void)
 {
     presentation::ClickAction eCA = GetActualClickAction();
 
@@ -646,8 +646,6 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
         default:
             break;
     }
-
-    return 0L;
 }
 
 IMPL_LINK_NOARG_TYPED(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 8fef0a3efb60..6d9dac5f2806 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -535,7 +535,7 @@ VclPtr<SfxTabPage> SdTpOptionsMisc::Create( vcl::Window* pWindow,
     return VclPtr<SdTpOptionsMisc>::Create( pWindow, *rAttrs );
 }
 
-IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void)
 {
     sal_Int32 nPos = m_pLbMetric->GetSelectEntryPos();
 
@@ -547,7 +547,6 @@ IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl)
         SetFieldUnit( *m_pMtrFldTabstop, eUnit );
         m_pMtrFldTabstop->SetValue( m_pMtrFldTabstop->Normalize( nVal ), FUNIT_TWIP );
     }
-    return 0;
 }
 
 void SdTpOptionsMisc::SetImpressMode()
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 25c0ce4310f4..0ef9b0806985 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -69,7 +69,7 @@ private:
     Fraction            maUIScale;
     ::sd::View*         mpView;
 
-    DECL_LINK( SelectColorHdl, void * );
+    DECL_LINK_TYPED( SelectColorHdl, ListBox&, void );
     DECL_LINK_TYPED( SetViewData, Button*, void );
     DECL_LINK_TYPED( SetDefault, Button*, void );
 };
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index b31862e13344..b622351fc5e2 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -52,8 +52,9 @@ private:
     void            CheckState();
 
     DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
-    DECL_LINK( SelectHdl, void* );
+    DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void );
     DECL_LINK_TYPED( StartShowHdl, Button*, void );
+    void SelectHdl(void*);
 
 public:
                 SdCustomShowDlg( vcl::Window* pWindow, SdDrawDocument& rDrawDoc );
@@ -86,6 +87,7 @@ private:
     DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
     DECL_LINK( ClickButtonHdl2, void* );
     DECL_LINK_TYPED( ClickButtonHdl3, SvTreeListBox*, void );
+    DECL_LINK_TYPED( ClickButtonHdl4, ListBox&, void );
     DECL_LINK_TYPED( OKHdl, Button*, void );
 
 public:
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index fe11b0768b45..2aba3666fc4d 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -45,7 +45,7 @@ private:
     void                FillFormatList();
     void                FillControls();
 
-    DECL_LINK( LanguageChangeHdl, void * );
+    DECL_LINK_TYPED( LanguageChangeHdl, ListBox&, void );
 
 public:
     SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet );
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 96c79583abb1..ad9af41a863d 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -145,7 +145,7 @@ private:
                                 DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void );
                                 DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void );
                                 DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool );
-                                DECL_LINK( SelectDocumentHdl, void * );
+                                DECL_LINK_TYPED( SelectDocumentHdl, ListBox&, void );
                                 DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
                                 DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool );
 
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 9abdd7b27f7f..9dc3854cdd53 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -182,7 +182,7 @@ private:
     DECL_LINK_TYPED( LastPageHdl, Button*, void );
 
     DECL_LINK_TYPED( DesignHdl, Button*, void );
-    DECL_LINK( DesignSelectHdl, void * );
+    DECL_LINK_TYPED( DesignSelectHdl, ListBox&, void );
     DECL_LINK_TYPED( DesignDeleteHdl, Button*, void );
     DECL_LINK_TYPED( BaseHdl, Button*, void );
     DECL_LINK_TYPED( ContentHdl, Button*, void );
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index aced93545f74..11d3232395ac 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -79,7 +79,7 @@ private:
     ::std::vector< long >   aVerbVector;
 
     DECL_LINK_TYPED( ClickSearchHdl, Button*, void );
-    DECL_LINK( ClickActionHdl, void * );
+    DECL_LINK_TYPED( ClickActionHdl, ListBox&, void );
     DECL_LINK_TYPED( SelectTreeHdl, SvTreeListBox*, void );
     DECL_LINK_TYPED( CheckFileHdl, Control&, void );
 
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 3f3676fd4650..26b0e0d6010e 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -117,7 +117,7 @@ private:
     static OUString        GetScale( sal_Int32 nX, sal_Int32 nY );
     static bool            SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY );
 
-    DECL_LINK( SelectMetricHdl_Impl, void * );
+    DECL_LINK_TYPED( SelectMetricHdl_Impl, ListBox&, void );
 
     /** Enable or disable the controls in the compatibility section of the
         'general' tab page depending on whether there is at least one