convert Link<> to typed

Change-Id: I6c55c74d47b13149c2fa210bb9de4e8c430c57cc

2 files changed, 16 insertions, 20 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index b027aabf0dfb..59a8f856584a 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -102,7 +102,7 @@ class SmFontDialog : public ModalDialog
 
     vcl::Font maFont;
 
-    DECL_LINK(FontSelectHdl, ComboBox *);
+    DECL_LINK_TYPED(FontSelectHdl, ComboBox&, void);
     DECL_LINK(FontModifyHdl, ComboBox *);
     DECL_LINK_TYPED(AttrChangeHdl, Button *, void);
 
@@ -434,12 +434,12 @@ class SmSymDefineDialog : public ModalDialog
     std::unique_ptr<SubsetMap> pSubsetMap;
     FontList           *pFontList;
 
-    DECL_LINK(OldSymbolChangeHdl, ComboBox *);
-    DECL_LINK(OldSymbolSetChangeHdl, ComboBox *);
+    DECL_LINK_TYPED(OldSymbolChangeHdl, ComboBox&, void);
+    DECL_LINK_TYPED(OldSymbolSetChangeHdl, ComboBox&, void);
     DECL_LINK(ModifyHdl, ComboBox *);
     DECL_LINK_TYPED(FontChangeHdl, ListBox&, void);
     DECL_LINK_TYPED(SubsetChangeHdl, ListBox&, void);
-    DECL_LINK(StyleChangeHdl, ComboBox *);
+    DECL_LINK_TYPED(StyleChangeHdl, ComboBox&, void);
     DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void);
     DECL_LINK_TYPED(AddClickHdl, Button *, void);
     DECL_LINK_TYPED(ChangeClickHdl, Button *, void);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 9e93e1f1b73b..b1d0bca9e333 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -295,11 +295,10 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
     Invalidate();
 }
 
-IMPL_LINK( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
+IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
 {
-    maFont.SetName(pComboBox->GetText());
+    maFont.SetName(rComboBox.GetText());
     m_pShowFont->SetFont(maFont);
-    return 0;
 }
 
 IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
@@ -308,7 +307,7 @@ IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
     sal_Int32 nPos = pComboBox->GetEntryPos( pComboBox->GetText() );
     if (COMBOBOX_ENTRY_NOTFOUND != nPos)
     {
-        FontSelectHdl( pComboBox );
+        FontSelectHdl( *pComboBox );
     }
     return 0;
 }
@@ -1791,25 +1790,23 @@ SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox)
 }
 
 
-IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox *, pComboBox )
+IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void )
 {
-    (void) pComboBox;
+    (void) rComboBox;
 #if OSL_DEBUG_LEVEL > 1
-    OSL_ENSURE(pComboBox == pOldSymbols, "Sm : wrong argument");
+    OSL_ENSURE(&rComboBox == pOldSymbols, "Sm : wrong argument");
 #endif
     SelectSymbol(*pOldSymbols, pOldSymbols->GetText(), false);
-    return 0;
 }
 
 
-IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox *, pComboBox )
+IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void )
 {
-    (void) pComboBox;
+    (void) rComboBox;
 #if OSL_DEBUG_LEVEL > 1
-    OSL_ENSURE(pComboBox == pOldSymbolSets, "Sm : wrong argument");
+    OSL_ENSURE(&rComboBox == pOldSymbolSets, "Sm : wrong argument");
 #endif
     SelectSymbolSet(*pOldSymbolSets, pOldSymbolSets->GetText(), false);
-    return 0;
 }
 
 
@@ -1867,15 +1864,14 @@ IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
 }
 
 
-IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, pComboBox )
+IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
 {
-    (void) pComboBox;
+    (void) rComboBox;
 #if OSL_DEBUG_LEVEL > 1
-    OSL_ENSURE(pComboBox == pStyles, "Sm : falsches Argument");
+    OSL_ENSURE(&rComboBox == pStyles, "Sm : falsches Argument");
 #endif
 
     SelectStyle(pStyles->GetText());
-    return 0;
 }