convert Link<> to typed

Change-Id: I822561725683231709343b80d7065c905226ebc1

2 files changed, 12 insertions, 11 deletions

diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 3d840723c9d4..3837febff35d 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -40,7 +40,7 @@ namespace dbaui
     class DbaMouseDownListBoxController : public ListBoxCellController
     {
     protected:
-        Link<>  m_aAdditionalModifyHdl;
+        Link<DbaMouseDownListBoxController&,void>  m_aAdditionalModifyHdl;
 
     public:
         explicit DbaMouseDownListBoxController(ListBoxControl* _pParent)
@@ -48,21 +48,21 @@ namespace dbaui
         {
         }
 
-        void SetAdditionalModifyHdl(const Link<>& _rHdl);
+        void SetAdditionalModifyHdl(const Link<DbaMouseDownListBoxController&,void>& _rHdl);
 
     protected:
         virtual bool WantMouseEvent() const override { return true; }
         virtual void callModifyHdl() override;
     };
 
-    void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link<>& _rHdl)
+    void DbaMouseDownListBoxController::SetAdditionalModifyHdl(const Link<DbaMouseDownListBoxController&,void>& _rHdl)
     {
         m_aAdditionalModifyHdl = _rHdl;
     }
 
     void DbaMouseDownListBoxController::callModifyHdl()
     {
-        m_aAdditionalModifyHdl.Call(nullptr);
+        m_aAdditionalModifyHdl.Call(*this);
         ListBoxCellController::callModifyHdl();
     }
 
@@ -383,13 +383,13 @@ namespace dbaui
         }
     }
 
-    IMPL_LINK( IndexFieldsControl, OnListEntrySelected, void*, p )
+    IMPL_LINK_TYPED( IndexFieldsControl, OnListEntrySelected, DbaMouseDownListBoxController&, rController, void )
     {
-        ListBox* _pBox = static_cast<ListBox*>(p);
-        if (!_pBox->IsTravelSelect())
+        ListBoxControl& rListBox = rController.GetListBox();
+        if (!rListBox.IsTravelSelect())
             m_aModifyHdl.Call(this);
 
-        if (_pBox == m_pFieldNameCell)
+        if (&rListBox == m_pFieldNameCell.get())
         {   // a field has been selected
             if (GetCurRow() >= GetRowCount() - 2)
             {   // and we're in one of the last two rows
@@ -417,7 +417,6 @@ namespace dbaui
 
             SaveModified();
         }
-        return 0L;
     }
     OUString IndexFieldsControl::GetCellText(long _nRow,sal_uInt16 nColId) const
     {
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index adbec31dbf3d..96ca024ed43c 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -28,10 +28,12 @@
 namespace dbaui
 {
 
+    class DbaMouseDownListBoxController;
+
     // IndexFieldsControl
     class IndexFieldsControl : public ::svt::EditBrowseBox
     {
-        OModuleClient        m_aModuleClient;
+        OModuleClient               m_aModuleClient;
     protected:
         IndexFields                 m_aSavedValue;
 
@@ -84,7 +86,7 @@ namespace dbaui
 
         bool isNewField() const { return GetCurRow() >= (sal_Int32)m_aFields.size(); }
 
-        DECL_LINK( OnListEntrySelected, void* );
+        DECL_LINK_TYPED( OnListEntrySelected, DbaMouseDownListBoxController&, void );
 
     private:
         using ::svt::EditBrowseBox::Init;