convert Link<> to typed

Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f

4 files changed, 6 insertions, 9 deletions

diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 02dbf3b2f17b..2f2b83ad8eca 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -240,7 +240,7 @@ namespace pcr
     }
 
 
-    IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB)
+    IMPL_LINK_TYPED(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB, void)
     {
         DBG_ASSERT(pLB == m_pControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?");
         (void)pLB;
@@ -253,8 +253,6 @@ namespace pcr
         m_pNoAssignment->SetClickHdl(Link<Button*,void>());
         m_pNoAssignment->Check(pData == NULL);
         m_pNoAssignment->SetClickHdl(LINK(this, OSelectLabelDialog, OnNoAssignmentClicked));
-
-        return 0L;
     }
 
 
@@ -286,8 +284,8 @@ namespace pcr
 
         if (m_pLastSelected)
         {
-            m_pControlTree->SetSelectHdl(Link<>());
-            m_pControlTree->SetDeselectHdl(Link<>());
+            m_pControlTree->SetSelectHdl(Link<SvTreeListBox*,void>());
+            m_pControlTree->SetDeselectHdl(Link<SvTreeListBox*,void>());
             m_pControlTree->Select(m_pLastSelected, !m_pNoAssignment->IsChecked());
             m_pControlTree->SetSelectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
             m_pControlTree->SetDeselectHdl(LINK(this, OSelectLabelDialog, OnEntrySelected));
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 146381112358..ee3bf66bc331 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -65,7 +65,7 @@ namespace pcr
     protected:
         sal_Int32 InsertEntries(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xContainer, SvTreeListEntry* pContainerEntry);
 
-        DECL_LINK(OnEntrySelected, SvTreeListBox*);
+        DECL_LINK_TYPED(OnEntrySelected, SvTreeListBox*, void);
         DECL_LINK_TYPED(OnNoAssignmentClicked, Button*, void);
     };
 
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 4895bd7cbfcf..4d245941ab74 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -712,7 +712,7 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox )
     return 0;
 }
 
-IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
+IMPL_LINK_TYPED( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox, void )
 {
     if( pBox == mpOptionBox && Sane::IsSane() )
     {
@@ -778,7 +778,6 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
             }
         }
     }
-    return 0;
 }
 
 IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit )
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 602bace9bea9..2854da5d4d29 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -84,7 +84,7 @@ private:
     DECL_LINK( SelectHdl, ListBox* );
     DECL_LINK( ModifyHdl, Edit* );
     DECL_LINK( ReloadSaneOptionsHdl, Sane* );
-    DECL_LINK( OptionsBoxSelectHdl, SvTreeListBox* );
+    DECL_LINK_TYPED( OptionsBoxSelectHdl, SvTreeListBox*, void );
 
     void SaveState();
     bool LoadState();