Gradually typed Link

Turn the Link class into a template abstracting over the link's argument and
return types, but provide default template arguments that keep the generic,
unsafe "void* in, sal_IntPtr out" behvior.  That way, individual uses of the
Link class can be updated over time.

All the related macros are duplicated with ..._TYPED counterparts, that
additionally take the RetType (except for LINK_TYPED, which manages to infer the
relevant types from the supplied Member).

(It would have been attractive to change the "untyped" LinkStubs from taking a
void* to a properly typed ArgType parameter, too, but that would cause
-fsanitize=function to flag uses of "untyped" Link::Call.)

Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8

3 files changed, 13 insertions, 13 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ec8633e980fb..e208cf6dce55 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -269,8 +269,8 @@ class SmShowSymbolSetWindow : public Control
 {
     VclPtr<ScrollBar>  m_pVScrollBar;
     SymbolPtrVec_t aSymbolSet;
-    Link        aSelectHdlLink;
-    Link        aDblClickHdlLink;
+    Link<>      aSelectHdlLink;
+    Link<>      aDblClickHdlLink;
     long        nLen;
     long        nRows, nColumns;
     long        nXOffset, nYOffset;
@@ -295,8 +295,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<>& rLink) { aSelectHdlLink = rLink; }
+    void SetDblClickHdl(const Link<>& rLink) { aDblClickHdlLink = rLink; }
 };
 
 class SmShowSymbolSet : public VclHBox
@@ -314,15 +314,15 @@ 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<>& rLink) { aSymbolWindow->SetSelectHdl(rLink); }
+    void SetDblClickHdl(const Link<>& rLink) { aSymbolWindow->SetDblClickHdl(rLink); }
 };
 
 
 
 class SmShowSymbol : public Control
 {
-    Link  aDblClickHdlLink;
+    Link<> aDblClickHdlLink;
 
     virtual void    Paint(vcl::RenderContext& rRenderContext, const Rectangle&) SAL_OVERRIDE;
     virtual void    MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
@@ -337,7 +337,7 @@ public:
     }
 
     void    SetSymbol(const SmSym *pSymbol);
-    void    SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; }
+    void    SetDblClickHdl(const Link<> &rLink) { aDblClickHdlLink = rLink; }
 };
 
 
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 20cfdf5bba11..d0288ac3b3ab 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -941,7 +941,7 @@ SmTextForwarder::~SmTextForwarder()
 {
     EditEngine *pEditEngine = rEditAcc.GetEditEngine();
     if (pEditEngine)
-        pEditEngine->SetNotifyHdl( Link() );
+        pEditEngine->SetNotifyHdl( Link<>() );
 }
 
 IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify*, aNotify)
@@ -1640,7 +1640,7 @@ void SmEditAccessible::ClearWin()
     // (avoid handler being called for already dead object)
     EditEngine *pEditEngine = GetEditEngine();
     if (pEditEngine)
-        pEditEngine->SetNotifyHdl( Link() );
+        pEditEngine->SetNotifyHdl( Link<>() );
 
     pWin = 0;   // implicitly results in AccessibleStateType::DEFUNC set
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 5e39c868a17d..6b7975f57e22 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -145,7 +145,7 @@ void SmEditWindow::dispose()
         EditEngine *pEditEngine = pEditView->GetEditEngine();
         if (pEditEngine)
         {
-            pEditEngine->SetStatusEventHdl( Link() );
+            pEditEngine->SetStatusEventHdl( Link<>() );
             pEditEngine->RemoveView( pEditView.get() );
         }
         pEditView.reset();
@@ -724,7 +724,7 @@ void SmEditWindow::LoseFocus()
 {
     EditEngine *pEditEngine = GetEditEngine();
     if (pEditEngine)
-        pEditEngine->SetStatusEventHdl( Link() );
+        pEditEngine->SetStatusEventHdl( Link<>() );
 
     Window::LoseFocus();
 
@@ -1105,7 +1105,7 @@ void SmEditWindow::DeleteEditView( SmViewShell & /*rView*/ )
         std::unique_ptr<EditEngine> xEditEngine(pEditView->GetEditEngine());
         if (xEditEngine)
         {
-            xEditEngine->SetStatusEventHdl( Link() );
+            xEditEngine->SetStatusEventHdl( Link<>() );
             xEditEngine->RemoveView( pEditView.get() );
         }
         pEditView.reset();