convert Link<> to typed

Change-Id: I17104bc529d67ca816415025d14e8e26c2531b29

2 files changed, 12 insertions, 14 deletions

diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 9c51bb421cbc..2280d3183f13 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -36,8 +36,8 @@ friend class ImpItemEdit;
     long nAktPaintRow;
     VclPtr<Edit> pEditControl;
     OUString aWNamMerk;
-    Link<> aEntryChangedHdl;
-    Link<> aSetDirtyHdl;
+    Link<_SdrItemBrowserControl&,void> aEntryChangedHdl;
+    Link<_SdrItemBrowserControl&,void> aSetDirtyHdl;
     ImpItemListRow* pAktChangeEntry;
     long   nLastWhichOfs;
     sal_uInt16 nLastWhich;
@@ -90,8 +90,8 @@ public:
 
     const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
     OUString GetNewEntryValue() const                 { return pEditControl->GetText(); }
-    void SetEntryChangedHdl(const Link<>& rLink)    { aEntryChangedHdl=rLink; }
-    void SetSetDirtyHdl(const Link<>& rLink)        { aSetDirtyHdl=rLink; }
+    void SetEntryChangedHdl(const Link<_SdrItemBrowserControl&,void>& rLink)    { aEntryChangedHdl=rLink; }
+    void SetSetDirtyHdl(const Link<_SdrItemBrowserControl&,void>& rLink)        { aSetDirtyHdl=rLink; }
 };
 
 #define WB_STDSIZEABLEDOCKWIN  (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)
@@ -118,8 +118,8 @@ class SdrItemBrowser: public _SdrItemBrowserWindow {
 private:
     static vcl::Window* ImpGetViewWin(SdrView& rView);
     DECL_LINK_TYPED(IdleHdl, Idle *, void);
-    DECL_LINK(ChangedHdl,_SdrItemBrowserControl*);
-    DECL_LINK(SetDirtyHdl, void *);
+    DECL_LINK_TYPED(ChangedHdl, _SdrItemBrowserControl&, void);
+    DECL_LINK_TYPED(SetDirtyHdl, _SdrItemBrowserControl&, void);
 public:
     SdrItemBrowser(SdrView& rView);
     void ForceParent();
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 98ac8ee6d9a4..85a3e1b5e953 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -426,7 +426,7 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
 
 void _SdrItemBrowserControl::SetDirty()
 {
-    aSetDirtyHdl.Call(this);
+    aSetDirtyHdl.Call(*this);
 }
 
 Rectangle _SdrItemBrowserControl::GetFieldCharacterBounds(sal_Int32 /*_nRow*/,sal_Int32 /*_nColumnPos*/,sal_Int32 /*nIndex*/)
@@ -531,7 +531,7 @@ bool _SdrItemBrowserControl::EndChangeEntry()
 {
     bool bRet = false;
     if (pEditControl!=nullptr) {
-        aEntryChangedHdl.Call(this);
+        aEntryChangedHdl.Call(*this);
         pEditControl.disposeAndClear();
         delete pAktChangeEntry;
         pAktChangeEntry=NULL;
@@ -1145,16 +1145,16 @@ IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void)
     Undirty();
 }
 
-IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
+IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, void)
 {
-    const ImpItemListRow* pEntry=pBrowse->GetAktChangeEntry();
+    const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry();
     if (pEntry!=NULL)
     {
         SfxItemSet aSet(pView->GetModel()->GetItemPool());
         pView->GetAttributes(aSet);
 
         SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId);
-        OUString aNewText(pBrowse->GetNewEntryValue());
+        OUString aNewText(rBrowse.GetNewEntryValue());
         bool bDel( aNewText == "del"
             || aNewText == "Del"
             || aNewText == "DEL"
@@ -1257,13 +1257,11 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
         }
         pView->SetAttributes(aNewSet,bDel);
     }
-    return 0;
 }
 
-IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl)
+IMPL_LINK_NOARG_TYPED(SdrItemBrowser, SetDirtyHdl, _SdrItemBrowserControl&, void)
 {
     SetDirty();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */