From 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 30 Apr 2015 10:20:00 +0200
Subject: 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
---
 basctl/source/basicide/bastype3.hxx | 12 ++++++------
 basctl/source/basicide/bastypes.cxx |  4 ++--
 basctl/source/inc/baside3.hxx       |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 43ad48511504..afc685b8ba60 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -30,9 +30,9 @@ class ExtendedEdit : public Edit
 {
 private:
     Accelerator     aAcc;
-    Link            aAccHdl;
-    Link            aGotFocusHdl;
-    Link            aLoseFocusHdl;
+    Link<>          aAccHdl;
+    Link<>          aGotFocusHdl;
+    Link<>          aLoseFocusHdl;
 
 protected:
     DECL_LINK( EditAccHdl, Accelerator * );
@@ -42,9 +42,9 @@ protected:
 public:
                     ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
 
-    void            SetAccHdl( const Link& rLink )          { aAccHdl = rLink; }
-    void            SetLoseFocusHdl( const Link& rLink )    { aLoseFocusHdl = rLink; }
-    void            SetGotFocusHdl( const Link& rLink )     { aGotFocusHdl = rLink; }
+    void            SetAccHdl( const Link<>& rLink )        { aAccHdl = rLink; }
+    void            SetLoseFocusHdl( const Link<>& rLink )  { aLoseFocusHdl = rLink; }
+    void            SetGotFocusHdl( const Link<>& rLink )   { aGotFocusHdl = rLink; }
     Accelerator&    GetAccelerator()                        { return aAcc; }
 };
 
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 278ac2f00f0d..8f9fd1717d41 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -62,9 +62,9 @@ BaseWindow::~BaseWindow()
 void BaseWindow::dispose()
 {
     if ( pShellVScrollBar )
-        pShellVScrollBar->SetScrollHdl( Link() );
+        pShellVScrollBar->SetScrollHdl( Link<>() );
     if ( pShellHScrollBar )
-        pShellHScrollBar->SetScrollHdl( Link() );
+        pShellHScrollBar->SetScrollHdl( Link<>() );
     pShellVScrollBar.clear();
     pShellHScrollBar.clear();
     vcl::Window::dispose();
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 7afe56da3c3b..2f229c20e069 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -58,7 +58,7 @@ private:
     DialogWindowLayout& rLayout;
     boost::scoped_ptr<DlgEditor> pEditor; // never nullptr
     boost::scoped_ptr<SfxUndoManager> pUndoMgr; // never nullptr
-    Link                aOldNotifyUndoActionHdl;
+    Link<>              aOldNotifyUndoActionHdl;
     OUString            aCurPath;
 
 protected:
-- 
cgit