convert Link<> to typed

Change-Id: I04987cc8c3eab52a7191d75cf0a9cde9049bfbd4

4 files changed, 8 insertions, 9 deletions

diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 91136716e8bc..3ec832926404 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -112,7 +112,7 @@ void ScCondFormatList::init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent,
             }
         }
         if(nCount)
-            EntrySelectHdl(maEntries[0].get());
+            EntrySelectHdl(*maEntries[0].get());
     }
     else
     {
@@ -388,10 +388,10 @@ IMPL_LINK_NOARG_TYPED( ScCondFormatList, RemoveBtnHdl, Button*, void )
     RecalcAll();
 }
 
-IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
+IMPL_LINK_TYPED( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry&, rEntry, void )
 {
-    if(pEntry->IsSelected())
-        return 0;
+    if(rEntry.IsSelected())
+        return;
 
     //A child has focus, but we will hide that, so regrab to whatever new thing gets
     //shown instead of leaving it stuck in the inaccessible hidden element
@@ -401,11 +401,10 @@ IMPL_LINK( ScCondFormatList, EntrySelectHdl, ScCondFrmtEntry*, pEntry )
         (*itr)->SetInactive();
     }
     mpDialogParent->InvalidateRefData();
-    pEntry->SetActive();
+    rEntry.SetActive();
     RecalcAll();
     if (bReGrabFocus)
         GrabFocus();
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED( ScCondFormatList, ScrollHdl, ScrollBar*, void )
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 5edd574fd269..d8cdaa173d14 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -78,7 +78,7 @@ bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
     {
-        ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, [this] () { maClickHdl.Call(this); } );
+        ImplCallEventListenersAndHandler( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, [this] () { maClickHdl.Call(*this); } );
     }
     return Control::Notify(rNEvt);
 }
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 6d9f3aec8c20..212b20436ef2 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -89,7 +89,7 @@ public:
     DECL_LINK_TYPED( AddBtnHdl, Button*, void );
     DECL_LINK_TYPED( RemoveBtnHdl, Button*, void );
     DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
-    DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* );
+    DECL_LINK_TYPED( EntrySelectHdl, ScCondFrmtEntry&, void );
 
     DECL_LINK_TYPED( TypeListHdl, ListBox&, void );
     DECL_LINK_TYPED( AfterTypeListHdl, void*, void );
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 876faa617d47..5c77a0e832cd 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -43,7 +43,7 @@ class ScCondFrmtEntry : public Control
 private:
     bool mbActive;
 
-    Link<> maClickHdl;
+    Link<ScCondFrmtEntry&,void> maClickHdl;
 
     //general ui elements
     VclPtr<FixedText> maFtCondNr;