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

3 files changed, 4 insertions, 4 deletions

diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index f0deec661e62..3560c01e2a58 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -48,7 +48,7 @@ ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( vcl::Window* pParent,
     get(m_pInsertColorLB, "entries");
     get(m_pMoveColorLB, "insertions");
 
-    Link aLk = LINK(this, ScRedlineOptionsTabPage, ColorHdl);
+    Link<> aLk = LINK(this, ScRedlineOptionsTabPage, ColorHdl);
     m_pContentColorLB->SetSelectHdl( aLk );
     m_pMoveColorLB->SetSelectHdl( aLk );
     m_pInsertColorLB->SetSelectHdl( aLk );
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 1f6416fc7197..3e7feb1ff2f8 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -58,7 +58,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(vcl::Window* pParent, const SfxItemSet& r
     mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString());
     mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString());
 
-    Link aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
+    Link<> aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
     mpBtnSepReset->SetClickHdl(aLink);
     mpBtnCustomCalcDefault->SetClickHdl(aLink);
     mpBtnCustomCalcCustom->SetClickHdl(aLink);
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 251285e85f64..c1d533417e13 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -69,13 +69,13 @@ ScTpContentOptions::ScTpContentOptions( vcl::Window*         pParent,
     get(pOutlineCB,"outline");
 
     SetExchangeSupport();
-    Link aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
+    Link<> aSelObjHdl(LINK( this, ScTpContentOptions, SelLbObjHdl ) );
     pObjGrfLB->  SetSelectHdl(aSelObjHdl);
     pDiagramLB-> SetSelectHdl(aSelObjHdl);
     pDrawLB->    SetSelectHdl(aSelObjHdl);
     pGridLB->    SetSelectHdl( LINK( this, ScTpContentOptions, GridHdl ) );
 
-    Link aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
+    Link<> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) );
     pFormulaCB  ->SetClickHdl(aCBHdl);
     pNilCB      ->SetClickHdl(aCBHdl);
     pAnnotCB    ->SetClickHdl(aCBHdl);