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

diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 03ac6c7045bd..ad6354b96105 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -57,7 +57,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
 {
     // Register at the EventMultiplexer to be informed about changes in the
     // center pane.
-    Link aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
+    Link<> aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
     mrBase.GetEventMultiplexer()->AddEventListener(
         aLink,
         sd::tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED
@@ -73,7 +73,7 @@ FormShellManager::~FormShellManager()
     UnregisterAtCenterPane();
 
     // Unregister from the EventMultiplexer.
-    Link aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
+    Link<> aLink (LINK(this, FormShellManager, ConfigurationUpdateHandler));
     mrBase.GetEventMultiplexer()->RemoveEventListener(aLink);
 
     if (mpSubShellFactory.get() != NULL)
@@ -91,7 +91,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell)
         // Disconnect from the old form shell.
         if (mpFormShell != NULL)
         {
-            mpFormShell->SetControlActivationHandler(Link());
+            mpFormShell->SetControlActivationHandler(Link<>());
             EndListening(*mpFormShell);
             mpFormShell->SetView(NULL);
         }