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

1 files changed, 18 insertions, 18 deletions

diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx
index ec6327656110..cc87c68ce50f 100644
--- a/include/svtools/calendar.hxx
+++ b/include/svtools/calendar.hxx
@@ -216,11 +216,11 @@ private:
                     mbSelLeft:1,
                     mbAllSel:1,
                     mbDropPos:1;
-    Link            maSelectionChangingHdl;
-    Link            maDateRangeChangedHdl;
-    Link            maRequestDateInfoHdl;
-    Link            maDoubleClickHdl;
-    Link            maSelectHdl;
+    Link<>          maSelectionChangingHdl;
+    Link<>          maDateRangeChangedHdl;
+    Link<>          maRequestDateInfoHdl;
+    Link<>          maDoubleClickHdl;
+    Link<>          maSelectHdl;
     Timer           maDragScrollTimer;
     sal_uInt16          mnDragScrollHitTest;
 
@@ -320,16 +320,16 @@ public:
     Size            CalcWindowSizePixel( long nCalcMonthPerLine = 1,
                                          long nCalcLines = 1 ) const;
 
-    void            SetSelectionChangingHdl( const Link& rLink ) { maSelectionChangingHdl = rLink; }
-    const Link&     GetSelectionChangingHdl() const { return maSelectionChangingHdl; }
-    void            SetDateRangeChangedHdl( const Link& rLink ) { maDateRangeChangedHdl = rLink; }
-    const Link&     GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; }
-    void            SetRequestDateInfoHdl( const Link& rLink ) { maRequestDateInfoHdl = rLink; }
-    const Link&     GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; }
-    void            SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
-    const Link&     GetDoubleClickHdl() const { return maDoubleClickHdl; }
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
+    void            SetSelectionChangingHdl( const Link<>& rLink ) { maSelectionChangingHdl = rLink; }
+    const Link<>&   GetSelectionChangingHdl() const { return maSelectionChangingHdl; }
+    void            SetDateRangeChangedHdl( const Link<>& rLink ) { maDateRangeChangedHdl = rLink; }
+    const Link<>&   GetDateRangeChangedHdl() const { return maDateRangeChangedHdl; }
+    void            SetRequestDateInfoHdl( const Link<>& rLink ) { maRequestDateInfoHdl = rLink; }
+    const Link<>&   GetRequestDateInfoHdl() const { return maRequestDateInfoHdl; }
+    void            SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+    const Link<>&   GetDoubleClickHdl() const { return maDoubleClickHdl; }
+    void            SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+    const Link<>&   GetSelectHdl() const { return maSelectHdl; }
 };
 
 inline const Color& Calendar::GetStandardColor() const
@@ -409,7 +409,7 @@ private:
     Date                maDefaultDate;
     bool                mbToday;
     bool                mbNone;
-    Link                maSelectHdl;
+    Link<>              maSelectHdl;
 
                         DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar* );
                         DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* );
@@ -437,8 +437,8 @@ public:
     void                SetCalendarStyle( WinBits nStyle ) { mnCalendarStyle = nStyle; }
     WinBits             GetCalendarStyle() const { return mnCalendarStyle; }
 
-    void                SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&         GetSelectHdl() const { return maSelectHdl; }
+    void                SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+    const Link<>&       GetSelectHdl() const { return maSelectHdl; }
 
 protected:
     virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;