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, 12 insertions, 12 deletions

diff --git a/include/svtools/stdmenu.hxx b/include/svtools/stdmenu.hxx
index 504db1f9b0c6..8628411e0810 100644
--- a/include/svtools/stdmenu.hxx
+++ b/include/svtools/stdmenu.hxx
@@ -101,8 +101,8 @@ class SVT_DLLPUBLIC FontNameMenu : public PopupMenu
 {
 private:
     OUString        maCurName;
-    Link            maSelectHdl;
-    Link            maHighlightHdl;
+    Link<>          maSelectHdl;
+    Link<>          maHighlightHdl;
 
 public:
                     FontNameMenu();
@@ -116,10 +116,10 @@ public:
     void            SetCurName( const OUString& rName );
     const OUString& GetCurName() const { return maCurName; }
 
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
-    void            SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
-    const Link&     GetHighlightHdl() const { return maHighlightHdl; }
+    void            SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+    const Link<>&   GetSelectHdl() const { return maSelectHdl; }
+    void            SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
+    const Link<>&   GetHighlightHdl() const { return maHighlightHdl; }
 };
 
 class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
@@ -127,8 +127,8 @@ class SVT_DLLPUBLIC FontSizeMenu : public PopupMenu
 private:
     long*           mpHeightAry;
     long            mnCurHeight;
-    Link            maSelectHdl;
-    Link            maHighlightHdl;
+    Link<>          maSelectHdl;
+    Link<>          maHighlightHdl;
 
 public:
                     FontSizeMenu();
@@ -142,10 +142,10 @@ public:
     void            SetCurHeight( long nHeight );
     long            GetCurHeight() const { return mnCurHeight; }
 
-    void            SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; }
-    const Link&     GetSelectHdl() const { return maSelectHdl; }
-    void            SetHighlightHdl( const Link& rLink ) { maHighlightHdl = rLink; }
-    const Link&     GetHighlightHdl() const { return maHighlightHdl; }
+    void            SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
+    const Link<>&   GetSelectHdl() const { return maSelectHdl; }
+    void            SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
+    const Link<>&   GetHighlightHdl() const { return maHighlightHdl; }
 };
 
 #endif // INCLUDED_SVTOOLS_STDMENU_HXX