convert Link<> to typed

Change-Id: I1140910c8e90a3022cc88ff33fa37db62007b745

5 files changed, 19 insertions, 26 deletions

diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index c2329e5fda54..07183e85ba59 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -494,7 +494,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
 
 
 
-IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharDoubleClickHdl, SvxShowCharSet*, void)
 {
     if (bOne)
     {
@@ -502,12 +502,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl)
         m_pShowText->SetText(OUString(&cChar, 1));
     }
     EndDialog( RET_OK );
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharSelectHdl, SvxShowCharSet*, void)
 {
     if ( !bOne )
     {
@@ -535,12 +534,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl)
 
     }
     m_pOKBtn->Enable();
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void)
 {
     OUString aText;
     sal_UCS4 cChar = m_pShowSet->GetSelectCharacter();
@@ -573,13 +571,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl)
         aText = OUString::createFromAscii(aBuf);
     }
     m_pCharCodeText->SetText( aText );
-
-    return 0;
 }
 
 
 
-IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl)
+IMPL_LINK_NOARG_TYPED(SvxCharacterMap, CharPreSelectHdl, SvxShowCharSet*, void)
 {
     // adjust subset selection
     if( pSubsetMap )
@@ -591,7 +587,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl)
     }
 
     m_pOKBtn->Enable();
-    return 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index fb0a61f49cd8..c3967d23e5de 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -84,10 +84,10 @@ private:
     DECL_LINK_TYPED(OKHdl, Button*, void);
     DECL_LINK(FontSelectHdl, void *);
     DECL_LINK(SubsetSelectHdl, void *);
-    DECL_LINK(CharDoubleClickHdl, void *);
-    DECL_LINK(CharSelectHdl, void *);
-    DECL_LINK(CharHighlightHdl, void *);
-    DECL_LINK(CharPreSelectHdl, void *);
+    DECL_LINK_TYPED(CharDoubleClickHdl, SvxShowCharSet*,void);
+    DECL_LINK_TYPED(CharSelectHdl, SvxShowCharSet*, void);
+    DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void);
+    DECL_LINK_TYPED(CharPreSelectHdl, SvxShowCharSet*, void);
 
     static void fillAllSubsets(ListBox &rListBox);
 
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index e23f941bffe7..c57cf37ea8ff 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -50,14 +50,14 @@ public:
     void            SelectCharacter( sal_uInt32 cNew, bool bFocus = false );
     sal_UCS4        GetSelectCharacter() const;
 
-    void            SetDoubleClickHdl( const Link<>& rLink ) { aDoubleClkHdl = rLink; }
-    void            SetSelectHdl( const Link<>& rHdl ) { aSelectHdl = rHdl; }
-    void            SetHighlightHdl( const Link<>& rHdl ) { aHighHdl = rHdl; }
-    void            SetPreSelectHdl( const Link<>& rHdl ) { aPreSelectHdl = rHdl; }
+    void            SetDoubleClickHdl( const Link<SvxShowCharSet*,void>& rLink ) { aDoubleClkHdl = rLink; }
+    void            SetSelectHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aSelectHdl = rHdl; }
+    void            SetHighlightHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aHighHdl = rHdl; }
+    void            SetPreSelectHdl( const Link<SvxShowCharSet*,void>& rHdl ) { aPreSelectHdl = rHdl; }
     static sal_uInt32& getSelectedChar();
     void            SetFont( const vcl::Font& rFont );
 
-    svx::SvxShowCharSetItem*  ImplGetItem( int _nPos );
+    svx::SvxShowCharSetItem*    ImplGetItem( int _nPos );
     int                         FirstInView() const;
     int                         LastInView() const;
     int                         PixelToMapIndex( const Point&) const;
@@ -92,10 +92,10 @@ protected:
 private:
     typedef std::map<sal_Int32, std::shared_ptr<svx::SvxShowCharSetItem> > ItemsMap;
     ItemsMap        m_aItems;
-    Link<>          aDoubleClkHdl;
-    Link<>          aSelectHdl;
-    Link<>          aHighHdl;
-    Link<>          aPreSelectHdl;
+    Link<SvxShowCharSet*,void>     aDoubleClkHdl;
+    Link<SvxShowCharSet*,void>     aSelectHdl;
+    Link<SvxShowCharSet*,void>     aHighHdl;
+    Link<SvxShowCharSet*,void>     aPreSelectHdl;
     svx::SvxShowCharSetVirtualAcc* m_pAccessible;
     css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
     long            nX;
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 7ac0f97ce6b0..1c7642c32cc7 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -438,7 +438,7 @@ class SmSymDefineDialog : public ModalDialog
     DECL_LINK(FontChangeHdl, ListBox *);
     DECL_LINK(SubsetChangeHdl, ListBox*);
     DECL_LINK(StyleChangeHdl, ComboBox *);
-    DECL_LINK(CharHighlightHdl, void *);
+    DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void);
     DECL_LINK_TYPED(AddClickHdl, Button *, void);
     DECL_LINK_TYPED(ChangeClickHdl, Button *, void);
     DECL_LINK_TYPED(DeleteClickHdl, Button *, void);
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 417594c26ee1..f43e831566e0 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1878,7 +1878,7 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, pComboBox )
 }
 
 
-IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
+IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void)
 {
    sal_UCS4 cChar = pCharsetDisplay->GetSelectCharacter();
 
@@ -1905,8 +1905,6 @@ IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl)
     aUnicodePos += aHex;
     pSymbols->SetText( aUnicodePos );
     pSymbolName->SetText( aUnicodePos );
-
-    return 0;
 }