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, 10 insertions, 13 deletions

diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 1e47e180a53d..16453d8ad16a 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -23,6 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <editeng/outliner.hxx>
 #include <svx/svxdllapi.h>
+#include <tools/link.hxx>
 #include <tools/shl.hxx>
 #include <tools/fract.hxx>
 #include <vcl/outdev.hxx>
@@ -119,10 +120,6 @@ bool SearchOutlinerItems(const SfxItemSet& rSet, bool bInklDefaults, bool* pbOnl
 // man dann irgendwann mit delete platthauen muss.
 sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd);
 
-
-
-class Link;
-
 // Hilfsklasse zur kommunikation zwischen dem Dialog
 // zum aufbrechen von Metafiles (sd/source/ui/dlg/brkdlg.cxx),
 // SdrEditView::DoImportMarkedMtf() und
@@ -142,10 +139,10 @@ private:
     sal_uIntPtr nObjCount;      // Anzahl der selektierten Objekte
     sal_uIntPtr nCurObj;            // Aktuelles Objekt
 
-    Link *pLink;
+    Link<> *pLink;
 
 public:
-    SvdProgressInfo( Link *_pLink );
+    SvdProgressInfo( Link<> *_pLink );
 
     void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
 
@@ -175,19 +172,19 @@ public:
 
 class SdrLinkList
 {
-    std::vector<Link*> aList;
+    std::vector<Link<>*> aList;
 protected:
-    unsigned FindEntry(const Link& rLink) const;
+    unsigned FindEntry(const Link<>& rLink) const;
 public:
     SdrLinkList(): aList()                   {}
     ~SdrLinkList()                           { Clear(); }
     SVX_DLLPUBLIC void Clear();
     unsigned GetLinkCount() const            { return (unsigned)aList.size(); }
-    Link& GetLink(unsigned nNum)             { return *aList[nNum]; }
-    const Link& GetLink(unsigned nNum) const { return *aList[nNum]; }
-    void InsertLink(const Link& rLink, unsigned nPos=0xFFFF);
-    void RemoveLink(const Link& rLink);
-    bool HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; }
+    Link<>& GetLink(unsigned nNum)           { return *aList[nNum]; }
+    const Link<>& GetLink(unsigned nNum) const { return *aList[nNum]; }
+    void InsertLink(const Link<>& rLink, unsigned nPos=0xFFFF);
+    void RemoveLink(const Link<>& rLink);
+    bool HasLink(const Link<>& rLink) const { return FindEntry(rLink)!=0xFFFF; }
 };
 
 SdrLinkList& ImpGetUserMakeObjHdl();