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

2 files changed, 13 insertions, 13 deletions

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 572773475374..b84fc43f21aa 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -167,11 +167,11 @@ private:
     Point   m_aOldRBPos;          ///< Right/Bottom of last VisArea
                                 // (used in Invalidate by Cursor)
 
-    Link m_aFlyMacroLnk;          /**< Link will be called, if the Crsr is set
+    Link<> m_aFlyMacroLnk;        /**< Link will be called, if the Crsr is set
                                    into a fly. A macro can be then becalled */
-    Link m_aChgLnk;               /**< link will be called by every attribute/
+    Link<> m_aChgLnk;             /**< link will be called by every attribute/
                                    format changes at cursor position.*/
-    Link m_aGrfArrivedLnk;        ///< Link calls to UI if a graphic is arrived
+    Link<> m_aGrfArrivedLnk;      ///< Link calls to UI if a graphic is arrived
 
     SwShellCrsr* m_pCurCrsr;      ///< current cursor
     SwShellCrsr* m_pCrsrStk;      ///< stack for the cursor
@@ -486,16 +486,16 @@ public:
     bool IsOverReadOnlyPos( const Point& rPt ) const;
 
     // Methods for aFlyMacroLnk.
-    void        SetFlyMacroLnk( const Link& rLnk ) { m_aFlyMacroLnk = rLnk; }
-    const Link& GetFlyMacroLnk() const             { return m_aFlyMacroLnk; }
+    void        SetFlyMacroLnk( const Link<>& rLnk ) { m_aFlyMacroLnk = rLnk; }
+    const Link<>& GetFlyMacroLnk() const           { return m_aFlyMacroLnk; }
 
     // Methods returning/altering link for changes of attributes/formates.
-    void        SetChgLnk( const Link &rLnk ) { m_aChgLnk = rLnk; }
-    const Link& GetChgLnk() const             { return m_aChgLnk; }
+    void        SetChgLnk( const Link<> &rLnk ) { m_aChgLnk = rLnk; }
+    const Link<>& GetChgLnk() const           { return m_aChgLnk; }
 
     // Methods returning/altering ling for "graphic completely loaded".
-    void        SetGrfArrivedLnk( const Link &rLnk ) { m_aGrfArrivedLnk = rLnk; }
-    const Link& GetGrfArrivedLnk() const             { return m_aGrfArrivedLnk; }
+    void        SetGrfArrivedLnk( const Link<> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
+    const Link<>& GetGrfArrivedLnk() const           { return m_aGrfArrivedLnk; }
 
     //Call ChgLink. When within an action calling will be delayed.
     void CallChgLnk();
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 71ab46719bcd..6daed2fb3549 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -258,7 +258,7 @@ class SW_DLLPUBLIC SwDoc :
     ::boost::scoped_ptr<SwNodes> m_pNodes;  //< document content (Nodes Array)
     SwAttrPool* mpAttrPool;             //< the attribute pool
     SwPageDescs maPageDescs;             //< PageDescriptors
-    Link        maOle2Link;              //< OLE 2.0-notification
+    Link<>      maOle2Link;              //< OLE 2.0-notification
     /* @@@MAINTAINABILITY-HORROR@@@
        Timer should not be members of the model
     */
@@ -1361,8 +1361,8 @@ public:
     ::sw::IShellCursorSupplier * GetIShellCursorSupplier();
 
     // OLE 2.0-notification.
-    inline       void  SetOle2Link(const Link& rLink) {maOle2Link = rLink;}
-    inline const Link& GetOle2Link() const {return maOle2Link;}
+    inline       void  SetOle2Link(const Link<>& rLink) {maOle2Link = rLink;}
+    inline const Link<>& GetOle2Link() const {return maOle2Link;}
 
     // insert section (the ODF kind of section, not the nodesarray kind)
     SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
@@ -1439,7 +1439,7 @@ public:
     // Call into intransparent Basic / JavaScript.
     sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
                         bool bChkPtr = false, SbxArray* pArgs = 0,
-                        const Link* pCallBack = 0 );
+                        const Link<>* pCallBack = 0 );
 
     /** Adjust left margin via object bar (similar to adjustment of numerations).
      One can either change the margin "by" adding or subtracting a given