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

diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index b03f05174a01..661ea918a641 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -185,15 +185,15 @@ private:
     PointerStyle        meLastStyle;
     WinBits             mnWinStyle;
     ToolBoxLayoutMode   meLayoutMode;
-    Link                maClickHdl;
-    Link                maDoubleClickHdl;
-    Link                maActivateHdl;
-    Link                maDeactivateHdl;
-    Link                maHighlightHdl;
-    Link                maSelectHdl;
-    Link                maCommandHandler;
-    Link                maStateChangedHandler;
-    Link                maDataChangedHandler;
+    Link<>              maClickHdl;
+    Link<>              maDoubleClickHdl;
+    Link<>              maActivateHdl;
+    Link<>              maDeactivateHdl;
+    Link<>              maHighlightHdl;
+    Link<>              maSelectHdl;
+    Link<>              maCommandHandler;
+    Link<>              maStateChangedHandler;
+    Link<>              maDataChangedHandler;
 
     public:
     using Window::ImplInit;
@@ -495,26 +495,26 @@ public:
     using DockingWindow::SetHelpId;
     using DockingWindow::GetHelpId;
 
-    void                SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
-    const Link&         GetClickHdl() const { return maClickHdl; }
-    void                SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; }
-    const Link&         GetDoubleClickHdl() const { return maDoubleClickHdl; }
-    void                SetDropdownClickHdl( const Link& rLink );
-    const Link&         GetDropdownClickHdl() const;
-    void                SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; }
-    const Link&         GetActivateHdl() const { return maActivateHdl; }
-    void                SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; }
-    const Link&         GetDeactivateHdl() const { return maDeactivateHdl; }
-    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                SetCommandHdl( const Link& aLink ) { maCommandHandler = aLink; }
-    const Link&         GetCommandHdl() const { return maCommandHandler; }
-    void                SetStateChangedHdl( const Link& aLink ) { maStateChangedHandler = aLink; }
-    const Link&         GetStateChangedHdl() const { return maStateChangedHandler; }
-    void                SetDataChangedHdl( const Link& aLink ) { maDataChangedHandler = aLink; }
-    const Link&         GetDataChangedHdl() { return maDataChangedHandler; }
+    void                SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
+    const Link<>&       GetClickHdl() const { return maClickHdl; }
+    void                SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
+    const Link<>&       GetDoubleClickHdl() const { return maDoubleClickHdl; }
+    void                SetDropdownClickHdl( const Link<>& rLink );
+    const Link<>&       GetDropdownClickHdl() const;
+    void                SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
+    const Link<>&       GetActivateHdl() const { return maActivateHdl; }
+    void                SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
+    const Link<>&       GetDeactivateHdl() const { return maDeactivateHdl; }
+    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                SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; }
+    const Link<>&       GetCommandHdl() const { return maCommandHandler; }
+    void                SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; }
+    const Link<>&       GetStateChangedHdl() const { return maStateChangedHandler; }
+    void                SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
+    const Link<>&       GetDataChangedHdl() { return maDataChangedHandler; }
 
     // support for custom menu (eg for configuration)
     // note: this menu will also be used to display currently
@@ -528,7 +528,7 @@ public:
     bool                IsMenuEnabled() const;
     PopupMenu*          GetMenu() const;
     void                UpdateCustomMenu();
-    void                SetMenuButtonHdl( const Link& rLink );
+    void                SetMenuButtonHdl( const Link<>& rLink );
 
     // open custommenu
     void                ExecuteCustomMenu();