convert Link<> to typed

Change-Id: If9d4ec8d33719a76603a266c14990897fbbc11a7

2 files changed, 17 insertions, 13 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 1c7642c32cc7..56205230fb66 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -271,8 +271,8 @@ class SmShowSymbolSetWindow : public Control
 {
     VclPtr<ScrollBar>  m_pVScrollBar;
     SymbolPtrVec_t aSymbolSet;
-    Link<>      aSelectHdlLink;
-    Link<>      aDblClickHdlLink;
+    Link<SmShowSymbolSetWindow&,void> aSelectHdlLink;
+    Link<SmShowSymbolSetWindow&,void> aDblClickHdlLink;
     long        nLen;
     long        nRows, nColumns;
     long        nXOffset, nYOffset;
@@ -297,8 +297,8 @@ public:
     void    SelectSymbol(sal_uInt16 nSymbol);
     sal_uInt16  GetSelectSymbol() const { return nSelectSymbol; }
     void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet);
-    void SetSelectHdl(const Link<>& rLink) { aSelectHdlLink = rLink; }
-    void SetDblClickHdl(const Link<>& rLink) { aDblClickHdlLink = rLink; }
+    void SetSelectHdl(const Link<SmShowSymbolSetWindow&,void>& rLink) { aSelectHdlLink = rLink; }
+    void SetDblClickHdl(const Link<SmShowSymbolSetWindow&,void>& rLink) { aDblClickHdlLink = rLink; }
 };
 
 class SmShowSymbolSet : public VclHBox
@@ -316,8 +316,8 @@ public:
     void    SelectSymbol(sal_uInt16 nSymbol) { aSymbolWindow->SelectSymbol(nSymbol); }
     sal_uInt16  GetSelectSymbol() const { return aSymbolWindow->GetSelectSymbol(); }
 
-    void SetSelectHdl(const Link<>& rLink) { aSymbolWindow->SetSelectHdl(rLink); }
-    void SetDblClickHdl(const Link<>& rLink) { aSymbolWindow->SetDblClickHdl(rLink); }
+    void SetSelectHdl(const Link<SmShowSymbolSetWindow&,void>& rLink) { aSymbolWindow->SetSelectHdl(rLink); }
+    void SetDblClickHdl(const Link<SmShowSymbolSetWindow&,void>& rLink) { aSymbolWindow->SetDblClickHdl(rLink); }
 };
 
 
@@ -365,8 +365,9 @@ class SmSymbolDialog : public ModalDialog
     VclPtr<OutputDevice> pFontListDev;
 
     DECL_LINK(SymbolSetChangeHdl, void*);
-    DECL_LINK(SymbolChangeHdl, void*);
+    DECL_LINK_TYPED(SymbolChangeHdl, SmShowSymbolSetWindow&, void);
     DECL_LINK(SymbolDblClickHdl, void*);
+    DECL_LINK_TYPED(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void);
     DECL_LINK_TYPED(EditClickHdl, Button*, void);
     DECL_LINK_TYPED(GetClickHdl, Button*, void);
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 08ea8a4ea2f3..c059a68e9420 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1193,10 +1193,10 @@ void SmShowSymbolSetWindow::MouseButtonDown(const MouseEvent& rMEvt)
                       m_pVScrollBar->GetThumbPos() * nColumns;
         SelectSymbol( sal::static_int_cast< sal_uInt16 >(nPos) );
 
-        aSelectHdlLink.Call(this);
+        aSelectHdlLink.Call(*this);
 
         if (rMEvt.GetClicks() > 1)
-            aDblClickHdlLink.Call(this);
+            aDblClickHdlLink.Call(*this);
     }
 }
 
@@ -1239,7 +1239,7 @@ void SmShowSymbolSetWindow::KeyInput(const KeyEvent& rKEvt)
     }
 
     SelectSymbol(n);
-    aSelectHdlLink.Call(this);
+    aSelectHdlLink.Call(*this);
 }
 
 void SmShowSymbolSetWindow::setScrollbar(ScrollBar *pVScrollBar)
@@ -1458,10 +1458,9 @@ IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl )
 }
 
 
-IMPL_LINK_NOARG( SmSymbolDialog, SymbolChangeHdl )
+IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void )
 {
     SelectSymbol(m_pSymbolSetDisplay->GetSelectSymbol());
-    return 0;
 }
 
 IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
@@ -1505,6 +1504,10 @@ IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
 }
 
 
+IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void )
+{
+    SymbolDblClickHdl(nullptr);
+}
 IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl )
 {
     GetClickHdl(m_pGetBtn);
@@ -1558,7 +1561,7 @@ SmSymbolDialog::SmSymbolDialog(vcl::Window *pParent, OutputDevice *pFntListDevic
 
     m_pSymbolSets->SetSelectHdl(LINK(this, SmSymbolDialog, SymbolSetChangeHdl));
     m_pSymbolSetDisplay->SetSelectHdl(LINK(this, SmSymbolDialog, SymbolChangeHdl));
-    m_pSymbolSetDisplay->SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl));
+    m_pSymbolSetDisplay->SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl2));
     m_pSymbolDisplay->SetDblClickHdl(LINK(this, SmSymbolDialog, SymbolDblClickHdl));
     m_pEditBtn->SetClickHdl(LINK(this, SmSymbolDialog, EditClickHdl));
     m_pGetBtn->SetClickHdl(LINK(this, SmSymbolDialog, GetClickHdl));