convert Link<> to typed

Change-Id: Ia2706c308c6297d05b2862e9f86fc0f2ee90e4f0

11 files changed, 18 insertions, 19 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 03c79109ebfb..22e011986f11 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1061,11 +1061,10 @@ IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the ValueSet with the bitmap-buttons
-IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl)
+IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ButtonsHdl, ValueSet*, void)
 {
     // if one bitmap-button is chosen, then disable TextOnly
     pPage5_TextOnly->Check(false);
-    return 0;
 }
 
 // Fill the SfxItemSet with the settings of the dialog
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 8d628912c285..288260f83e2b 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -71,6 +71,7 @@ public:
 
 protected:
     DECL_LINK( SelectHdl, void * );
+    DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
 
 private:
     SlideLayoutController& mrController;
@@ -184,7 +185,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
     SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
 
     mpLayoutSet1 = createEmptyValueSetControl();
-    mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
+    mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) );
 
     const snewfoil_value_info* pInfo = 0;
     sal_Int16 nColCount = 4;
@@ -213,7 +214,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
     {
         mpLayoutSet2 = VclPtr<ValueSet>::Create( this, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT );
 
-        mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
+        mpLayoutSet2->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) );
         mpLayoutSet2->SetColCount( 4 );
         mpLayoutSet2->EnableFullItemMode( false );
         mpLayoutSet2->SetColor( GetControlBackground() );
@@ -267,6 +268,10 @@ void LayoutToolbarMenu::dispose()
     svtools::ToolbarMenu::dispose();
 }
 
+IMPL_LINK_TYPED( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void )
+{
+    SelectHdl(pControl);
+}
 IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
 {
     if ( IsInPopupMode() )
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 86e742a38456..0776519fadb1 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -168,10 +168,9 @@ void SdPresLayoutDlg::FillValueSet()
 /**
  * DoubleClick handler
  */
-IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl)
+IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
 {
     EndDialog(RET_OK);
-    return 0;
 }
 
 /**
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 1514594cae75..a4bb07f14601 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -188,7 +188,7 @@ private:
     DECL_LINK_TYPED( ContentHdl, Button*, void );
     DECL_LINK_TYPED( GfxFormatHdl, Button *, void );
     DECL_LINK_TYPED( ResolutionHdl, Button*, void );
-    DECL_LINK( ButtonsHdl, void * );
+    DECL_LINK_TYPED( ButtonsHdl, ValueSet*, void );
     DECL_LINK_TYPED( ColorHdl, Button*, void );
     DECL_LINK_TYPED( WebServerHdl, Button *, void );
     DECL_LINK_TYPED( SlideChgHdl, Button*, void );
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index 2c88259dc8e7..69b83cec9135 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -46,7 +46,7 @@ public:
 
     void                GetAttr(SfxItemSet& rOutAttrs);
 
-    DECL_LINK(ClickLayoutHdl, void *);
+    DECL_LINK_TYPED(ClickLayoutHdl, ValueSet*, void);
     DECL_LINK_TYPED(ClickLoadHdl, Button*, void);
 
 private:
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 0494f47a3b17..3eda44c82c08 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -368,10 +368,9 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount)
     return nRowCount;
 }
 
-IMPL_LINK_NOARG(LayoutMenu, ClickHandler)
+IMPL_LINK_NOARG_TYPED(LayoutMenu, ClickHandler, ValueSet*, void)
 {
-    AssignLayoutToSelectedSlides (GetSelectedAutoLayout());
-    return 0;
+    AssignLayoutToSelectedSlides( GetSelectedAutoLayout() );
 }
 
 /** The specified layout is assigned to the current page of the view shell
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 917c5541b4bc..813682f361df 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -188,7 +188,7 @@ private:
 
     /** When clicked then set the current page of the view in the center pane.
     */
-    DECL_LINK(ClickHandler, void *);
+    DECL_LINK_TYPED(ClickHandler, ValueSet*, void);
     DECL_LINK(RightClickHandler, MouseEvent*);
     DECL_LINK(StateChangeHandler, void *);
     DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent*);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 014787244fd0..716fc9ef4495 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -170,14 +170,12 @@ ResId MasterPagesSelector::GetContextMenuResId() const
     return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP);
 }
 
-IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler)
+IMPL_LINK_NOARG_TYPED(MasterPagesSelector, ClickHandler, ValueSet*, void)
 {
     // We use the framework to assign the clicked-on master page because we
     // so use the same mechanism as the context menu does (where we do not
     // have the option to call the assignment method directly.)
     ExecuteCommand(mnDefaultClickAction);
-
-    return 0;
 }
 
 IMPL_LINK(MasterPagesSelector, RightClickHandler, MouseEvent*, pEvent)
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 5f6819a522f2..df32909486d6 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -191,7 +191,7 @@ private:
         last seen.  This value is used heuristically to speed up the lookup
         of an index for a token.
     */
-    DECL_LINK(ClickHandler, void *);
+    DECL_LINK_TYPED(ClickHandler, ValueSet*, void);
     DECL_LINK(RightClickHandler, MouseEvent*);
     DECL_LINK(ContextMenuCallback, CommandEvent*);
     DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent*);
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 910aa9e44f54..85eb63f46224 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -161,12 +161,11 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
         return 0;
 }
 
-IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl)
+IMPL_LINK_NOARG_TYPED(TableDesignWidget, implValueSetHdl, ValueSet*, void)
 {
     mbStyleSelected = true;
     if( !mbModal )
         ApplyStyle();
-    return 0;
 }
 
 void TableDesignWidget::ApplyStyle()
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 64fb0070d23a..065e124f514b 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -86,7 +86,7 @@ private:
     void FillDesignPreviewControl();
 
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*);
-    DECL_LINK(implValueSetHdl, void *);
+    DECL_LINK_TYPED(implValueSetHdl, ValueSet*, void);
     DECL_LINK_TYPED(implCheckBoxHdl, Button*, void);
 
 private: