convert Link<> to typed

Change-Id: I6c55c74d47b13149c2fa210bb9de4e8c430c57cc

10 files changed, 25 insertions, 19 deletions

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3ed9f44f0e6a..e73e1177363f 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -999,7 +999,7 @@ void TPGalleryThemeProperties::FillFilterList()
 
 
 
-IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, SelectFileTypeHdl, ComboBox&, void)
 {
     OUString aText( m_pCbbFileType->GetText() );
 
@@ -1010,8 +1010,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
         if( ScopedVclPtrInstance<MessageDialog>::Create( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" )->Execute() == RET_YES )
             SearchFiles();
     }
-
-    return 0L;
 }
 
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 495d46fd6f81..b06ec7d05e0b 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -381,18 +381,16 @@ void SvxThesaurusDialog::LookUp_Impl()
     m_pLeftBtn->Enable( aLookUpHistory.size() > 1 );
 }
 
-IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox *, pBox )
+IMPL_LINK_TYPED( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void )
 {
-    if (pBox && !m_pWordCB->IsTravelSelect())  // act only upon return key and not when traveling with cursor keys
+    if (!m_pWordCB->IsTravelSelect())  // act only upon return key and not when traveling with cursor keys
     {
-        const sal_Int32 nPos = pBox->GetSelectEntryPos();
-        OUString aStr( pBox->GetEntry( nPos ) );
+        const sal_Int32 nPos = rBox.GetSelectEntryPos();
+        OUString aStr( rBox.GetEntry( nPos ) );
         aStr = linguistic::GetThesaurusReplaceText( aStr );
         m_pWordCB->SetText( aStr );
         LookUp_Impl();
     }
-
-    return 0;
 }
 
 IMPL_LINK_TYPED( SvxThesaurusDialog, AlternativesSelectHdl_Impl, SvTreeListBox *, pBox, void )
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index aa47ede58c17..a2e8746772c5 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -132,9 +132,10 @@ private:
     void                Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
     bool                FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
 
-    DECL_LINK_TYPED(UpdateHdl_Impl, Idle *, void);
+    DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void );
     DECL_LINK(          FontModifyHdl_Impl, void* );
-    DECL_LINK_TYPED(FontModifyListBoxHdl_Impl, ListBox&, void);
+    DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void );
+    DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void );
 
 public:
     using SfxTabPage::ActivatePage;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index b777a3632aa6..1e39b37171b8 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -283,7 +283,7 @@ class TPGalleryThemeProperties : public SfxTabPage
                         DECL_LINK_TYPED( ClickTakeHdl, Button*, void );
                         DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void );
                         DECL_LINK_TYPED( SelectFoundHdl, ListBox&, void );
-                        DECL_LINK( SelectFileTypeHdl, void* );
+                        DECL_LINK_TYPED( SelectFileTypeHdl, ComboBox&, void );
                         DECL_LINK_TYPED( DClickFoundHdl, ListBox&, void );
                         DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void );
                         DECL_LINK_TYPED( EndSearchProgressHdl, Dialog&, void );
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index efecaa65d6a6..0aede59214a8 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -114,7 +114,7 @@ private:
     DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void );
     DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void );
 
-    DECL_LINK(SelectHdl_Impl, void *);
+    DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void );
     DECL_LINK(ModifyHdl_Impl, void *);
     DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void );
     DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void );
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index 78146c30bd43..82f2332ec8ef 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -145,7 +145,7 @@ public:
     DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void );
     DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void );
     DECL_LINK_TYPED( LanguageHdl_Impl, ListBox&, void );
-    DECL_LINK( WordSelectHdl_Impl, ComboBox * );
+    DECL_LINK_TYPED( WordSelectHdl_Impl, ComboBox&, void );
     DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void );
     DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool );
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 1967ab3ed09c..9b6537236c04 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -89,13 +89,14 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
 
     aTextColor = m_pCheckLB->GetTextColor();
     Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
+    Link<ComboBox&,void> aLink2(LINK(this, SvxFontSubstTabPage, SelectComboBoxHdl));
     Link<Button*,void> aClickLink(LINK(this, SvxFontSubstTabPage, ClickHdl));
 
     m_pCheckLB->SetSelectHdl(LINK(this, SvxFontSubstTabPage, TreeListBoxSelectHdl));
     m_pUseTableCB->SetClickHdl(aClickLink);
-    m_pFont1CB->SetSelectHdl(aLink);
+    m_pFont1CB->SetSelectHdl(aLink2);
     m_pFont1CB->SetModifyHdl(aLink);
-    m_pFont2CB->SetSelectHdl(aLink);
+    m_pFont2CB->SetSelectHdl(aLink2);
     m_pFont2CB->SetModifyHdl(aLink);
     m_pApply->SetClickHdl(aClickLink);
     m_pDelete->SetClickHdl(aClickLink);
@@ -265,6 +266,10 @@ IMPL_LINK_TYPED(SvxFontSubstTabPage, TreeListBoxSelectHdl, SvTreeListBox*, pButt
 {
     SelectHdl(pButton);
 }
+IMPL_LINK_TYPED(SvxFontSubstTabPage, SelectComboBoxHdl, ComboBox&, rBox, void)
+{
+    SelectHdl(&rBox);
+}
 IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
 {
     if (pWin == m_pApply || pWin == m_pDelete)
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index db822b31e9af..7615d9483f97 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -82,6 +82,7 @@ class SvxFontSubstTabPage : public SfxTabPage
     SvLBoxButtonData*   pCheckButtonData;
 
     DECL_LINK(SelectHdl, vcl::Window *);
+    DECL_LINK_TYPED(SelectComboBoxHdl, ComboBox&, void);
     DECL_LINK_TYPED(ClickHdl, Button*, void);
     DECL_LINK_TYPED(TreeListBoxSelectHdl, SvTreeListBox*, void);
     DECL_LINK_TYPED(NonPropFontsHdl, Button*, void);
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 451930219ec7..7efc88e6a102 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -427,7 +427,7 @@ void SvxCharNamePage::Initialize()
     m_pWestFontNameLB->SetModifyHdl( aLink );
     m_pWestFontStyleLB->SetModifyHdl( aLink );
     m_pWestFontSizeLB->SetModifyHdl( aLink );
-    m_pWestFontLanguageLB->SetSelectHdl( aLink );
+    m_pWestFontLanguageLB->SetSelectHdl( LINK( this, SvxCharNamePage, FontModifyComboBoxHdl_Impl ) );
     m_pEastFontNameLB->SetModifyHdl( aLink );
     m_pEastFontStyleLB->SetModifyHdl( aLink );
     m_pEastFontSizeLB->SetModifyHdl( aLink );
@@ -1183,6 +1183,10 @@ IMPL_LINK_NOARG_TYPED(SvxCharNamePage, UpdateHdl_Impl, Idle *, void)
 
 
 
+IMPL_LINK_TYPED( SvxCharNamePage, FontModifyComboBoxHdl_Impl, ComboBox&, rBox, void )
+{
+    FontModifyHdl_Impl(&rBox);
+}
 IMPL_LINK_TYPED( SvxCharNamePage, FontModifyListBoxHdl_Impl, ListBox&, rBox, void )
 {
     FontModifyHdl_Impl(&rBox);
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 6ed9f87c9ab3..066843953d96 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -657,7 +657,7 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, vo
     }
 }
 
-IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxTabulatorTabPage, SelectHdl_Impl, ComboBox&, void)
 {
     sal_Int32 nPos = m_pTabBox->GetValuePos( m_pTabBox->GetValue( eDefUnit ), eDefUnit );
     if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
@@ -666,7 +666,6 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl)
         m_pNewBtn->Disable();
         SetFillAndTabType_Impl();
     }
-    return 0;
 }
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl)