From 16e0ee6e6a4eb1802e06dd1d682b1a3b1affeb5c Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 15 Sep 2015 15:28:04 +0200
Subject: convert Link<> to typed

Change-Id: I8eb0df9a20a748286385fb6c9d4d03c2ad153989
---
 sfx2/source/dialog/templdlg.cxx | 10 +++++-----
 sfx2/source/inc/templdgi.hxx    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sfx2/source')

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fb78251687e2..b5124e98e602 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -431,7 +431,7 @@ PopupMenu* StyleTreeListBox_Impl::CreateContextMenu()
 */
 bool StyleTreeListBox_Impl::DoubleClickHdl()
 {
-    aDoubleClickLink.Call(this);
+    aDoubleClickLink.Call(nullptr);
     return false;
 }
 
@@ -453,7 +453,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
         const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
         if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() )
         {
-            aDoubleClickLink.Call( this );
+            aDoubleClickLink.Call( nullptr );
             nRet = true;
         }
     }
@@ -2088,11 +2088,12 @@ void SfxCommonTemplateDialog_Impl::ResetFocus()
 
 IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, TreeListApplyHdl, SvTreeListBox *, bool )
 {
-    return ApplyHdl(NULL) == 1;
+    ApplyHdl(nullptr);
+    return false;
 }
 
 // Double-click on a style sheet in the ListBox is applied.
-IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, /*pControl*/ )
+IMPL_LINK_NOARG_TYPED( SfxCommonTemplateDialog_Impl, ApplyHdl, LinkParamNone*, void )
 {
     // only if that region is allowed
     if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] &&
@@ -2105,7 +2106,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, /*pControl*/ )
                      0, 0, &nModifier );
     }
     ResetFocus();
-    return 0;
 }
 
 // Selection of a template during the Watercan-Status
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 0ece9f511b59..d0c77161a3c4 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -97,7 +97,7 @@ class StyleTreeListBox_Impl : public DropListBox_Impl
 {
 private:
     SvTreeListEntry* pCurEntry;
-    Link<> aDoubleClickLink;
+    Link<LinkParamNone*,void> aDoubleClickLink;
     Link<> aDropLink;
     OUString  aParent;
     OUString aStyle;
@@ -116,7 +116,7 @@ public:
 
     void Recalc();
 
-    void SetDoubleClickHdl(const Link<> &rLink)
+    void SetDoubleClickHdl(const Link<LinkParamNone*,void> &rLink)
     {
         aDoubleClickLink = rLink;
     }
@@ -217,7 +217,7 @@ protected:
 
     DECL_LINK( FilterSelectHdl, ListBox* );
     DECL_LINK_TYPED( FmtSelectHdl, SvTreeListBox*, void );
-    DECL_LINK( ApplyHdl, Control* );
+    DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void );
     DECL_LINK_TYPED( TreeListApplyHdl, SvTreeListBox*, bool );
     DECL_LINK( DropHdl, StyleTreeListBox_Impl* );
     DECL_LINK_TYPED( TimeOut, Idle*, void );
-- 
cgit