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

4 files changed, 7 insertions, 7 deletions

diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index 8bb5992705dc..c866de077559 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -139,7 +139,7 @@ class MacroSnippet
 
     void ResetError()
     {
-        StarBASIC::SetGlobalErrorHdl( Link() );
+        StarBASIC::SetGlobalErrorHdl( Link<>() );
         mbError = false;
     }
 };
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index c63c03eabef5..559cb3cb36f9 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1838,17 +1838,17 @@ bool StarBASIC::ErrorHdl()
     return aErrorHdl.IsSet() && aErrorHdl.Call( this );
 }
 
-Link StarBASIC::GetGlobalErrorHdl()
+Link<> StarBASIC::GetGlobalErrorHdl()
 {
     return GetSbData()->aErrHdl;
 }
 
-void StarBASIC::SetGlobalErrorHdl( const Link& rLink )
+void StarBASIC::SetGlobalErrorHdl( const Link<>& rLink )
 {
     GetSbData()->aErrHdl = rLink;
 }
 
-void StarBASIC::SetGlobalBreakHdl( const Link& rLink )
+void StarBASIC::SetGlobalBreakHdl( const Link<>& rLink )
 {
     GetSbData()->aBreakHdl = rLink;
 }
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 0d4395c866ba..96b6fa4df2b2 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1725,7 +1725,7 @@ bool SbModule::ExceedsLegacyModuleSize()
 
 class ErrorHdlResetter
 {
-    Link    mErrHandler;
+    Link<>  mErrHandler;
     bool    mbError;
 public:
     ErrorHdlResetter() : mbError( false )
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index e36873d1c20b..a82674ed5527 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -91,8 +91,8 @@ struct SbiGlobals
     SbModule*       pMod;           // currently active module
     SbModule*       pCompMod;       // currently compiled module
     short           nInst;          // number of BASICs
-    Link            aErrHdl;        // global error handler
-    Link            aBreakHdl;      // global break handler
+    Link<>          aErrHdl;        // global error handler
+    Link<>          aBreakHdl;      // global break handler
     SbError         nCode;
     sal_Int32       nLine;
     sal_Int32       nCol1,nCol2;    // from... to...