convert Link<> to typed

Change-Id: I6c55c74d47b13149c2fa210bb9de4e8c430c57cc

4 files changed, 13 insertions, 8 deletions

diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index bbe4db6bfbb6..8c5ea57b9d44 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -96,9 +96,9 @@ namespace dbaui
 
         // set the modify handlers
         m_pFieldSeparator->SetUpdateDataHdl(getControlModifiedLink());
-        m_pFieldSeparator->SetSelectHdl(getControlModifiedLink());
+        m_pFieldSeparator->SetSelectHdl(LINK(this, OTextConnectionHelper, ComboBoxSelectHdl));
         m_pTextSeparator->SetUpdateDataHdl(getControlModifiedLink());
-        m_pTextSeparator->SetSelectHdl(getControlModifiedLink());
+        m_pTextSeparator->SetSelectHdl(LINK(this, OTextConnectionHelper, ComboBoxSelectHdl));
         m_pCharSet->SetSelectHdl(LINK(this, OTextConnectionHelper, CharsetSelectHdl));
 
         m_pFieldSeparator->SetModifyHdl(getControlModifiedLink());
@@ -156,6 +156,11 @@ namespace dbaui
         getControlModifiedLink().Call(&rListBox);
     }
 
+    IMPL_LINK_TYPED(OTextConnectionHelper, ComboBoxSelectHdl, ComboBox&, rBox, void)
+    {
+        getControlModifiedLink().Call(&rBox);
+    }
+
     OTextConnectionHelper::~OTextConnectionHelper()
     {
         disposeOnce();
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 75fa11b6b6ef..752ccbf22346 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -86,6 +86,7 @@ namespace dbaui
         DECL_LINK(OnControlModified,Control*);
         DECL_LINK(OnEditModified,Edit*);
         DECL_LINK_TYPED(CharsetSelectHdl,ListBox&,void);
+        DECL_LINK_TYPED(ComboBoxSelectHdl,ComboBox&,void);
 
     private:
         OUString    GetSeparator( const ComboBox& rBox, const OUString& rList );
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 26fe737feb97..8665b977d1d5 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -248,12 +248,12 @@ IMPL_LINK_NOARG_TYPED( ODbaseIndexDialog, OnListEntrySelected, ListBox&, void )
     checkButtons();
 }
 
-IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox )
+IMPL_LINK_TYPED( ODbaseIndexDialog, TableSelectHdl, ComboBox&, rComboBox, void )
 {
     // search the table
     TableInfoList::iterator aTablePos;
-    if (!GetTable(pComboBox->GetText(), aTablePos))
-        return 0L;
+    if (!GetTable(rComboBox.GetText(), aTablePos))
+        return;
 
     // fill the listbox for the indexes
     m_pLB_TableIndexes->Clear();
@@ -267,7 +267,6 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox )
         m_pLB_TableIndexes->SelectEntryPos(0);
 
     checkButtons();
-    return 0;
 }
 
 void ODbaseIndexDialog::Init()
@@ -414,7 +413,7 @@ void ODbaseIndexDialog::SetCtrls()
     if( m_aFreeIndexList.size() )
         m_pLB_FreeIndexes->SelectEntryPos( 0 );
 
-    TableSelectHdl(m_pCB_Tables);
+    TableSelectHdl(*m_pCB_Tables);
     checkButtons();
 }
 
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 8afac21cf89d..e7fcbd76d755 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -83,7 +83,7 @@ protected:
     VclPtr<PushButton>     m_pAddAll;
     VclPtr<PushButton>     m_pRemoveAll;
 
-    DECL_LINK( TableSelectHdl, ComboBox* );
+    DECL_LINK_TYPED( TableSelectHdl, ComboBox&, void );
     DECL_LINK_TYPED( AddClickHdl, Button*, void );
     DECL_LINK_TYPED( RemoveClickHdl, Button*, void );
     DECL_LINK_TYPED( AddAllClickHdl, Button*, void );