From 8491065b9a673450bd62d8b837540d879f5ce07e Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 14 Sep 2015 14:17:56 +0200
Subject: convert Link<> to typed

Change-Id: Id8ea19a0fe04061c6ec35229f41c164b4ebd408c
---
 sd/source/ui/controller/slidelayoutcontroller.cxx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'sd')

diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 288260f83e2b..3319f654aa4b 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -70,9 +70,9 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
 protected:
-    DECL_LINK( SelectHdl, void * );
+    DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void );
     DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
-
+    void SelectHdl(void*);
 private:
     SlideLayoutController& mrController;
     Reference< XFrame > mxFrame;
@@ -182,7 +182,7 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
     SvtLanguageOptions aLanguageOptions;
     const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled();
 
-    SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectHdl ) );
+    SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectToolbarMenuHdl ) );
 
     mpLayoutSet1 = createEmptyValueSetControl();
     mpLayoutSet1->SetSelectHdl( LINK( this, LayoutToolbarMenu, SelectValueSetHdl ) );
@@ -272,7 +272,12 @@ IMPL_LINK_TYPED( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void
 {
     SelectHdl(pControl);
 }
-IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
+IMPL_LINK_TYPED( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void )
+{
+    SelectHdl(pControl);
+}
+
+void LayoutToolbarMenu::SelectHdl(void* pControl)
 {
     if ( IsInPopupMode() )
         EndPopupMode();
@@ -304,8 +309,6 @@ IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
     }
 
     mrController.dispatchCommand( sCommandURL, aArgs );
-
-    return 0;
 }
 
 OUString SlideLayoutController_getImplementationName() throw (css::uno::RuntimeException)
-- 
cgit