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

61 files changed, 199 insertions, 199 deletions

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 40360a67a398..9fbd9516a908 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1094,7 +1094,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
     sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
     m_pEntriesBox->SetEntryText(sLabel, nPos, nCol);
 
-    ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+    ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
     return 0;
 }
 
@@ -1109,7 +1109,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
     m_pEntriesBox->SetEntryText( OUString(), nPos, nCol );
     (pEntry->m_sCommand).clear();
 
-    ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+    ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
     return 0;
 }
 
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
     if ( pEntry )
         m_pGroupLBox->Select( pEntry );
 
-    ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+    ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
     return 1L;
 }
 
@@ -1438,7 +1438,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
     m_pFileDlg->AddFilter( aFilterCfgStr, OUString("*.cfg") );
     m_pFileDlg->SetCurrentFilter( aFilterCfgStr );
 
-    Link aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
+    Link<> aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
                                 : LINK( this, SfxAcceleratorConfigPage, LoadHdl );
     m_pFileDlg->StartExecuteModal( aDlgClosedLink );
 }
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 9ca5201839d4..cd7e84d75ecf 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -723,7 +723,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
     m_xModifiable = xModifiable;
     SvHeaderTabListBox&    rListBox = mpImpl->pEventLB->GetListBox();
     HeaderBar&            rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
-    Link                aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
+    Link<>              aLnk(LINK(this, _SvxMacroTabPage, AssignDeleteHdl_Impl ));
     mpImpl->pDeletePB->SetClickHdl(    aLnk );
     mpImpl->pAssignPB->SetClickHdl(    aLnk );
     if( mpImpl->pAssignComponentPB )
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index dc55f899db19..9f3e149545a4 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -90,7 +90,7 @@ namespace svx{
 class SpellUndoAction_Impl : public SfxUndoAction
 {
     sal_uInt16          m_nId;
-    const Link&     m_rActionLink;
+    const Link<>&   m_rActionLink;
     //undo of button enabling
     bool            m_bEnableChangePB;
     bool            m_bEnableChangeAllPB;
@@ -107,7 +107,7 @@ class SpellUndoAction_Impl : public SfxUndoAction
     long            m_nOffset;
 
 public:
-    SpellUndoAction_Impl(sal_uInt16 nId, const Link& rActionLink) :
+    SpellUndoAction_Impl(sal_uInt16 nId, const Link<>& rActionLink) :
         m_nId(nId),
         m_rActionLink( rActionLink),
         m_bEnableChangePB(false),
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 23ec6c06cceb..bad1390a024f 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -331,10 +331,10 @@ public:
 
     void                KeyMove( int dx, int dy );
 
-    void                SetModifyHdl( Link& rLink ) { maModifyHdl = rLink; }
+    void                SetModifyHdl( Link<>& rLink ) { maModifyHdl = rLink; }
 
 private:
-    Link maModifyHdl;
+    Link<> maModifyHdl;
     ColorMode meMode;
     Color maColor;
     double mdX;
@@ -728,12 +728,12 @@ public:
 
     void                KeyMove( int dy );
 
-    void SetModifyHdl( Link& rLink ) { maModifyHdl = rLink; }
+    void SetModifyHdl( Link<>& rLink ) { maModifyHdl = rLink; }
 
     sal_Int16 GetLevel() const { return mnLevel; }
 
 private:
-    Link maModifyHdl;
+    Link<> maModifyHdl;
     Color maColor;
     ColorMode meMode;
     Bitmap* mpBitmap;
@@ -1059,7 +1059,7 @@ ColorPickerDialog::ColorPickerDialog( vcl::Window* pParent, sal_Int32 nColor, sa
     set_width_request(aDialogSize.Width() + 50);
     set_height_request(aDialogSize.Height() + 30);
 
-    Link aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) );
+    Link<> aLink( LINK( this, ColorPickerDialog, ColorModifyHdl ) );
     mpColorField->SetModifyHdl( aLink );
     mpColorSlider->SetModifyHdl( aLink );
 
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 0e11f72b8ccd..f7a063979589 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -75,7 +75,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
 }
 
 FmSearchDialog::FmSearchDialog(vcl::Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
-    const Link& lnkContextSupplier)
+    const Link<>& lnkContextSupplier)
     :ModalDialog(pParent, "RecordSearchDialog", "cui/ui/fmsearchdialog.ui")
     ,m_sCancel( Button::GetStandardText( StandardButtonType::Cancel ) )
     ,m_pPreSearchFocus( NULL )
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 549d21054447..a4e9ea50b114 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -269,7 +269,7 @@ short SearchProgress::Execute()
 
 
 
-void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl )
+void SearchProgress::StartExecuteModal( const Link<>& rEndDialogHdl )
 {
     assert(!maSearchThread.is());
     maSearchThread = new SearchThread(
@@ -447,7 +447,7 @@ short TakeProgress::Execute()
 
 
 
-void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
+void TakeProgress::StartExecuteModal( const Link<>& rEndDialogHdl )
 {
     assert(!maTakeThread.is());
     maTakeThread = new TakeThread(
@@ -1100,7 +1100,7 @@ void TPGalleryThemeProperties::TakeFiles()
         pTakeProgress->Update();
 
         pTakeProgress->StartExecuteModal(
-            Link() /* no postprocessing needed, pTakeProgress
+            Link<>() /* no postprocessing needed, pTakeProgress
                       will be disposed in TakeProgress::CleanupHdl */ );
     }
 }
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cf039ed1a678..8e55edafedc5 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -496,7 +496,7 @@ namespace svx
         return 0L;
     }
 
-    void SuggestionDisplay::SetSelectHdl( const Link& rLink )
+    void SuggestionDisplay::SetSelectHdl( const Link<>& rLink )
     {
         m_aSelectLink = rLink;
     }
@@ -656,43 +656,43 @@ namespace svx
     }
 
 
-    void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link<>& _rHdl )
     {
         m_aOptionsChangedLink = _rHdl;
     }
 
 
-    void HangulHanjaConversionDialog::SetIgnoreHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetIgnoreHdl( const Link<>& _rHdl )
     {
         m_pIgnore->SetClickHdl( _rHdl );
     }
 
 
-    void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link<>& _rHdl )
     {
         m_pIgnoreAll->SetClickHdl( _rHdl );
     }
 
 
-    void HangulHanjaConversionDialog::SetChangeHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetChangeHdl( const Link<>& _rHdl )
     {
         m_pReplace->SetClickHdl( _rHdl );
     }
 
 
-    void HangulHanjaConversionDialog::SetChangeAllHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetChangeAllHdl( const Link<>& _rHdl )
     {
         m_pReplaceAll->SetClickHdl( _rHdl );
     }
 
 
-    void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetFindHdl( const Link<>& _rHdl )
     {
         m_pFind->SetClickHdl( _rHdl );
     }
 
 
-    void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<>& _rHdl )
     {
         m_pSimpleConversion->SetClickHdl( _rHdl );
         m_pHangulBracketed->SetClickHdl( _rHdl );
@@ -704,7 +704,7 @@ namespace svx
     }
 
 
-    void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link& _rHdl )
+    void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<>& _rHdl )
     {
         m_aClickByCharacterLink = _rHdl;
     }
@@ -1408,7 +1408,7 @@ namespace svx
 
     void SuggestionEdit::DoJump( bool _bUp )
     {
-        const Link&     rLoseFocusHdl = GetLoseFocusHdl();
+        const Link<>&   rLoseFocusHdl = GetLoseFocusHdl();
         if( rLoseFocusHdl.IsSet() )
             rLoseFocusHdl.Call( this );
         m_pScrollBar->SetThumbPos( m_pScrollBar->GetThumbPos() + ( _bUp? -1 : 1 ) );
@@ -1815,7 +1815,7 @@ namespace svx
         #error number of suggestions should not under-run the value of 5
     #endif
 
-        Link    aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
+        Link<>  aScrLk( LINK( this, HangulHanjaEditDictDialog, ScrollHdl ) );
         m_aScrollSB->SetScrollHdl( aScrLk );
         m_aScrollSB->SetEndScrollHdl( aScrLk );
         m_aScrollSB->SetRangeMin( 0 );
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index e6cb7c0a4b31..860fa291d06c 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -70,7 +70,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
 
 
     // set handlers
-    Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
+    Link<> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
     m_pRbtLinktypInternet->SetClickHdl( aLink );
     m_pRbtLinktypFTP->SetClickHdl     ( aLink );
     m_pCbAnonymous->SetClickHdl       ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index b256fa40a468..00ca41532978 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -181,7 +181,7 @@ SvInsertOleDlg::SvInsertOleDlg
     get(m_pCbFilelink, "linktofile");
     m_pLbObjecttype->SetDoubleClickHdl( LINK( this, SvInsertOleDlg, DoubleClickHdl ) );
     m_pBtnFilepath->SetClickHdl( LINK( this, SvInsertOleDlg, BrowseHdl ) );
-    Link aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
+    Link<> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
     m_pRbNewObject->SetClickHdl( aLink );
     m_pRbObjectFromfile->SetClickHdl( aLink );
     m_pRbNewObject->Check( true );
@@ -553,7 +553,7 @@ void SfxInsertFloatingFrameDialog::Init()
     get(m_pNMMarginHeight, "height");
     get(m_pCBMarginHeightDefault, "defaultheight");
 
-    Link aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
+    Link<> aLink( LINK( this, SfxInsertFloatingFrameDialog, CheckHdl ) );
     m_pCBMarginWidthDefault->SetClickHdl( aLink );
     m_pCBMarginHeightDefault->SetClickHdl( aLink );
 
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 98a97d0e8656..a1fead79e130 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -510,7 +510,7 @@ SvxScriptOrgDialog::~SvxScriptOrgDialog()
 void SvxScriptOrgDialog::dispose()
 {
     // clear the SelectHdl so that it isn't called during the dtor
-    m_pScriptsBox->SetSelectHdl( Link() );
+    m_pScriptsBox->SetSelectHdl( Link<>() );
     m_pScriptsBox.clear();
     m_pRunButton.clear();
     m_pCloseButton.clear();
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 2465369cbc9b..85dc0d2881ec 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -151,22 +151,22 @@ SvxZoomDialog::SvxZoomDialog( vcl::Window* pParent, const SfxItemSet& rCoreSet )
     get(m_pColumnsEdit, "columnssb");
     get(m_pBookModeChk, "bookmode");
     get(m_pOKBtn, "ok");
-    Link aLink = LINK(this, SvxZoomDialog, UserHdl);
+    Link<> aLink = LINK(this, SvxZoomDialog, UserHdl);
     m_p100Btn->SetClickHdl(aLink);
     m_pOptimalBtn->SetClickHdl(aLink);
     m_pPageWidthBtn->SetClickHdl(aLink);
     m_pWholePageBtn->SetClickHdl(aLink);
     m_pUserBtn->SetClickHdl(aLink);
 
-    Link aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
+    Link<> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl);
     m_pAutomaticBtn->SetClickHdl(aViewLayoutLink);
     m_pSingleBtn->SetClickHdl(aViewLayoutLink);
     m_pColumnsBtn->SetClickHdl(aViewLayoutLink);
 
-    Link aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
+    Link<> aViewLayoutSpinLink = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl);
     m_pColumnsEdit->SetModifyHdl(aViewLayoutSpinLink);
 
-    Link aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
+    Link<> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl);
     m_pBookModeChk->SetClickHdl(aViewLayoutCheckLink);
 
     m_pOKBtn->SetClickHdl(LINK(this, SvxZoomDialog, OKHdl));
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 9b682d5d4ac3..c6079c396994 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -159,7 +159,7 @@ VclAbstractDialog2_Impl::~VclAbstractDialog2_Impl()
 }
 
 // virtual
-void  VclAbstractDialog2_Impl::StartExecuteModal( const Link& rEndDialogHdl )
+void  VclAbstractDialog2_Impl::StartExecuteModal( const Link<>& rEndDialogHdl )
 {
     m_aEndDlgHdl = rEndDialogHdl;
     m_pDlg->StartExecuteModal(
@@ -180,7 +180,7 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg )
     }
 
     m_aEndDlgHdl.Call( this );
-    m_aEndDlgHdl = Link();
+    m_aEndDlgHdl = Link<>();
 
     return 0L;
 }
@@ -271,41 +271,41 @@ void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( editeng::Han
      pDlg->SetConversionFormat(_eType);
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetOptionsChangedHdl( const Link<>& _rHdl )
 {
      pDlg->SetOptionsChangedHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreHdl( const Link<>& _rHdl )
 {
      pDlg->SetIgnoreHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetIgnoreAllHdl( const Link<>& _rHdl )
 {
      pDlg->SetIgnoreAllHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetChangeHdl( const Link<>& _rHdl )
 {
     pDlg->SetChangeHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<>& _rHdl )
 {
     pDlg->SetChangeAllHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<>& _rHdl )
 {
      pDlg->SetClickByCharacterHdl(_rHdl );
 }
 
-void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl( const Link<>& _rHdl )
 {
     pDlg->SetConversionFormatChangedHdl(_rHdl );
 }
-void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link& _rHdl )
+void AbstractHangulHanjaConversionDialog_Impl::SetFindHdl( const Link<>& _rHdl )
 {
      pDlg->SetFindHdl(_rHdl );
 }
@@ -647,7 +647,7 @@ OUString AbstractSvxTransformTabDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
-void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rLink )
+void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
 {
     pDlg->SetValidateFramePosLink( rLink );
 }
@@ -686,7 +686,7 @@ OUString AbstractSvxCaptionDialog_Impl::GetText() const
 {
     return pDlg->GetText();
 }
-void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink )
+void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
 {
     pDlg->SetValidateFramePosLink( rLink );
 }
@@ -717,13 +717,13 @@ void AbstractSvxNameDialog_Impl::GetName(OUString& rName)
     pDlg->GetName( rName );
 }
 
-void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link& rLink, bool bCheckImmediately )
+void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately )
 {
     aCheckNameHdl = rLink;
     if( rLink.IsSet() )
         pDlg->SetCheckNameHdl( LINK(this, AbstractSvxNameDialog_Impl, CheckNameHdl), bCheckImmediately );
     else
-        pDlg->SetCheckNameHdl( Link(), bCheckImmediately );
+        pDlg->SetCheckNameHdl( Link<>(), bCheckImmediately );
 }
 void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& aHelpId)
 {
@@ -749,7 +749,7 @@ void AbstractSvxObjectNameDialog_Impl::GetName(OUString& rName)
     pDlg->GetName(rName);
 }
 
-void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link& rLink, bool bCheckImmediately)
+void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately)
 {
     aCheckNameHdl = rLink;
 
@@ -759,7 +759,7 @@ void AbstractSvxObjectNameDialog_Impl::SetCheckNameHdl(const Link& rLink, bool b
     }
     else
     {
-        pDlg->SetCheckNameHdl(Link(), bCheckImmediately);
+        pDlg->SetCheckNameHdl(Link<>(), bCheckImmediately);
     }
 }
 
@@ -829,11 +829,11 @@ bool AbstractSvxHpLinkDlg_Impl::QueryClose()
 }
 
 
-void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link& lnk)
+void AbstractFmSearchDialog_Impl::SetFoundHandler(const Link<>& lnk)
 {
     pDlg->SetFoundHandler(lnk);
 }
-void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const Link& lnk)
+void AbstractFmSearchDialog_Impl::SetCanceledNotFoundHdl(const Link<>& lnk)
 {
     pDlg->SetCanceledNotFoundHdl(lnk);
 }
@@ -922,21 +922,21 @@ bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const
 {
     return pDlg->IsOkEnabled();
 }
-void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link& rLink )
+void AbstractSvxPostItDialog_Impl::SetNextHdl( const Link<>& rLink )
 {
     aNextHdl = rLink;
     if( rLink.IsSet() )
         pDlg->SetNextHdl( LINK(this, AbstractSvxPostItDialog_Impl, NextHdl ) );
     else
-        pDlg->SetNextHdl( Link() );
+        pDlg->SetNextHdl( Link<>() );
 }
-void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link& rLink )
+void AbstractSvxPostItDialog_Impl::SetPrevHdl( const Link<>& rLink )
 {
     aPrevHdl = rLink;
     if( rLink.IsSet() )
         pDlg->SetPrevHdl( LINK(this, AbstractSvxPostItDialog_Impl, PrevHdl ) );
     else
-        pDlg->SetPrevHdl( Link() );
+        pDlg->SetPrevHdl( Link<>() );
 }
 IMPL_LINK_NOARG(AbstractSvxPostItDialog_Impl, NextHdl)
 {
@@ -1452,7 +1452,7 @@ AbstractFmSearchDialog*  AbstractDialogFactory_Impl::CreateFmSearchDialog(vcl::W
                                                         const OUString& strInitialText,
                                                         const ::std::vector< OUString >& _rContexts,
                                                         sal_Int16 nInitialContext,
-                                                        const Link& lnkContextSupplier)
+                                                        const Link<>& lnkContextSupplier)
 {
     VclPtrInstance<FmSearchDialog> pDlg( pParent, strInitialText, _rContexts,
                                          nInitialContext, lnkContextSupplier );
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 69ecf5fb7e0c..4a4dbcd1cc10 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -83,11 +83,11 @@ short Class::Execute()                              \
 class VclAbstractDialog2_Impl : public VclAbstractDialog2
 {
     ScopedVclPtr<Dialog> m_pDlg;
-    Link            m_aEndDlgHdl;
+    Link<>          m_aEndDlgHdl;
 public:
                     VclAbstractDialog2_Impl( Dialog* p ) : m_pDlg( p ) {}
     virtual         ~VclAbstractDialog2_Impl();
-    virtual void    StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+    virtual void    StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
     virtual long    GetResult() SAL_OVERRIDE;
 private:
                     DECL_LINK( EndDialogHdl, Dialog* );
@@ -145,14 +145,14 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver
     virtual void      SetByCharacter( bool _bByCharacter ) SAL_OVERRIDE ;
     virtual void      SetConversionDirectionState( bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) SAL_OVERRIDE;
     virtual void      SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) SAL_OVERRIDE;
-    virtual void      SetOptionsChangedHdl( const Link& _rHdl ) SAL_OVERRIDE;
-    virtual void      SetIgnoreHdl( const Link& _rHdl ) SAL_OVERRIDE;
-    virtual void      SetIgnoreAllHdl( const Link& _rHdl ) SAL_OVERRIDE ;
-    virtual void      SetChangeHdl( const Link& _rHdl ) SAL_OVERRIDE ;
-    virtual void      SetChangeAllHdl( const Link& _rHdl ) SAL_OVERRIDE ;
-    virtual void      SetClickByCharacterHdl( const Link& _rHdl ) SAL_OVERRIDE ;
-    virtual void      SetConversionFormatChangedHdl( const Link& _rHdl ) SAL_OVERRIDE ;
-    virtual void      SetFindHdl( const Link& _rHdl ) SAL_OVERRIDE;
+    virtual void      SetOptionsChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
+    virtual void      SetIgnoreHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
+    virtual void      SetIgnoreAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+    virtual void      SetChangeHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+    virtual void      SetChangeAllHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+    virtual void      SetClickByCharacterHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+    virtual void      SetConversionFormatChangedHdl( const Link<>& _rHdl ) SAL_OVERRIDE ;
+    virtual void      SetFindHdl( const Link<>& _rHdl ) SAL_OVERRIDE;
     virtual bool      GetUseBothDirections( ) const SAL_OVERRIDE;
     virtual editeng::HangulHanjaConversion::ConversionDirection
                       GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE;
@@ -311,7 +311,7 @@ class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDial
 class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
-    virtual void SetValidateFramePosLink( const Link& rLink ) SAL_OVERRIDE;
+    virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
     virtual void                SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void                SetCurPageId( const OString& rName ) SAL_OVERRIDE;
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
@@ -324,7 +324,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
 class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
-    virtual void SetValidateFramePosLink( const Link& rLink ) SAL_OVERRIDE;
+    virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
     virtual void                SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
     virtual void                SetCurPageId( const OString& rName ) SAL_OVERRIDE;
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
@@ -354,13 +354,13 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog)
     virtual void    GetName( OUString& rName ) SAL_OVERRIDE ;
-    virtual void    SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ;
+    virtual void    SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ;
     virtual void    SetEditHelpId(const OString&) SAL_OVERRIDE ;
     //from class Window
     virtual void    SetHelpId( const OString& ) SAL_OVERRIDE ;
     virtual void    SetText( const OUString& rStr ) SAL_OVERRIDE ;
 private:
-    Link aCheckNameHdl;
+    Link<> aCheckNameHdl;
     DECL_LINK(CheckNameHdl, void *);
 };
 
@@ -371,10 +371,10 @@ class AbstractSvxObjectNameDialog_Impl :public AbstractSvxObjectNameDialog
 {
     DECL_ABSTDLG_BASE(AbstractSvxObjectNameDialog_Impl, SvxObjectNameDialog)
     virtual void GetName(OUString& rName) SAL_OVERRIDE ;
-    virtual void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false) SAL_OVERRIDE;
+    virtual void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false) SAL_OVERRIDE;
 
 private:
-    Link aCheckNameHdl;
+    Link<> aCheckNameHdl;
     DECL_LINK(CheckNameHdl, void *);
 };
 
@@ -422,8 +422,8 @@ class FmSearchDialog;
 class AbstractFmSearchDialog_Impl :public AbstractFmSearchDialog
 {
     DECL_ABSTDLG_BASE(AbstractFmSearchDialog_Impl,FmSearchDialog)
-    virtual void SetFoundHandler(const Link& lnk) SAL_OVERRIDE ;
-    virtual void SetCanceledNotFoundHdl(const Link& lnk) SAL_OVERRIDE;
+    virtual void SetFoundHandler(const Link<>& lnk) SAL_OVERRIDE ;
+    virtual void SetCanceledNotFoundHdl(const Link<>& lnk) SAL_OVERRIDE;
     virtual void SetActiveField(const OUString& strField) SAL_OVERRIDE;
 };
 
@@ -478,8 +478,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
     DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog )
     virtual void                SetText( const OUString& rStr ) SAL_OVERRIDE;  //From class Window
     virtual const SfxItemSet*   GetOutputItemSet() const SAL_OVERRIDE;
-    virtual void                SetPrevHdl( const Link& rLink ) SAL_OVERRIDE ;
-    virtual void                SetNextHdl( const Link& rLink ) SAL_OVERRIDE ;
+    virtual void                SetPrevHdl( const Link<>& rLink ) SAL_OVERRIDE ;
+    virtual void                SetNextHdl( const Link<>& rLink ) SAL_OVERRIDE ;
     virtual void                EnableTravel(bool bNext, bool bPrev) SAL_OVERRIDE ;
     virtual OUString            GetNote() SAL_OVERRIDE ;
     virtual void                SetNote(const OUString& rTxt) SAL_OVERRIDE ;
@@ -490,8 +490,8 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
     virtual bool                IsOkEnabled() const SAL_OVERRIDE;
     virtual vcl::Window *            GetWindow() SAL_OVERRIDE;
 private:
-    Link aNextHdl;
-    Link aPrevHdl;
+    Link<> aNextHdl;
+    Link<> aPrevHdl;
     DECL_LINK(NextHdl, void *);
     DECL_LINK(PrevHdl, void *);
 };
@@ -646,7 +646,7 @@ public:
                                                         const OUString& strInitialText,
                                                         const ::std::vector< OUString >& _rContexts,
                                                         sal_Int16 nInitialContext,
-                                                        const Link& lnkContextSupplier) SAL_OVERRIDE;
+                                                        const Link<>& lnkContextSupplier) SAL_OVERRIDE;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterEmboss(vcl::Window* pParent,
                                                 const Graphic& rGraphic, RECT_POINT eLightSource) SAL_OVERRIDE;
     virtual AbstractGraphicFilterDialog *   CreateGraphicFilterPoster(vcl::Window* pParent,
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 411df36dd123..6f8b3161cd26 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -66,7 +66,7 @@ private:
     sal_uInt16          m_nErrorEnd;
     bool            m_bIsUndoEditMode;
 
-    Link            m_aModifyLink;
+    Link<>          m_aModifyLink;
 
     void            CallModifyLink() {m_aModifyLink.Call(this);}
 
@@ -77,7 +77,7 @@ protected:
 public:
     SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits);
 
-    void            SetModifyHdl(const Link& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;}
+    void            SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE { m_aModifyLink = rLink;}
 
     void            SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
     void            SetText( const OUString& rStr ) SAL_OVERRIDE;
@@ -159,7 +159,7 @@ private:
     OUString        m_sTitleSpelling;
     OUString        m_sTitleSpellingGrammar;
 
-    Link            aDialogUndoLink;
+    Link<>          aDialogUndoLink;
 
     bool            bModified;
     bool            bFocusLocked;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index d56700e45e7a..fa2224a45802 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -181,7 +181,7 @@ public:
 
 class AutoCorrEdit : public Edit
 {
-    Link    aActionLink;
+    Link<>  aActionLink;
     bool    bSpaces;
 
     public:
@@ -190,7 +190,7 @@ class AutoCorrEdit : public Edit
                     AutoCorrEdit(vcl::Window* pParent) :
                         Edit(pParent), bSpaces(false){}
 
-    void            SetActionHdl( const Link& rLink )
+    void            SetActionHdl( const Link<>& rLink )
                                 { aActionLink = rLink;}
 
     void            SetSpaces(bool bSet)
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 759b1406d3e6..3038b4b80d57 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -531,7 +531,7 @@ public:
 class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
 {
     Size            m_aCheckBoxImageSizePixel;
-    Link            m_aChangedListener;
+    Link<>          m_aChangedListener;
     SvLBoxButtonData*   m_pButtonData;
     VclPtr<SvxConfigPage>  pPage;
 
@@ -551,10 +551,10 @@ public:
     virtual ~SvxToolbarEntriesListBox();
     virtual void dispose() SAL_OVERRIDE;
 
-    void            SetChangedListener( const Link& aChangedListener )
+    void            SetChangedListener( const Link<>& aChangedListener )
         { m_aChangedListener = aChangedListener; }
 
-    const Link&     GetChangedListener() const { return m_aChangedListener; }
+    const Link<>&   GetChangedListener() const { return m_aChangedListener; }
 
     Size            GetCheckBoxPixelSize() const
         { return m_aCheckBoxImageSizePixel; }
@@ -672,7 +672,7 @@ private:
     VclPtr<Edit>           m_pEdtName;
     VclPtr<OKButton>       m_pBtnOK;
 
-    Link            aCheckNameHdl;
+    Link<>          aCheckNameHdl;
 
     DECL_LINK(ModifyHdl, Edit*);
 
@@ -688,7 +688,7 @@ public:
         return m_pEdtName->GetText();
     }
 
-    void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false )
+    void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false )
     {
         aCheckNameHdl = rLink;
         if ( bCheckImmediately )
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index d56c9d5ee2a4..f0717aa758e2 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -78,10 +78,10 @@ class FmSearchDialog : public ModalDialog
 
     VclPtr<vcl::Window>         m_pPreSearchFocus;
 
-    Link    m_lnkFoundHandler;          ///< Handler for "found"
-    Link    m_lnkCanceledNotFoundHdl;   ///< Handler for Positioning the Cursors
+    Link<>  m_lnkFoundHandler;          ///< Handler for "found"
+    Link<>  m_lnkCanceledNotFoundHdl;   ///< Handler for Positioning the Cursors
 
-    Link    m_lnkContextSupplier;       ///< for search in contexts
+    Link<>  m_lnkContextSupplier;       ///< for search in contexts
 
     /// memorize the currently selected field for every context
     ::std::vector<OUString> m_arrContextFields;
@@ -108,7 +108,7 @@ public:
         arrFields of the context)
     */
     FmSearchDialog(vcl::Window* pParent, const OUString& strInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
-        const Link& lnkContextSupplier);
+        const Link<>& lnkContextSupplier);
 
     virtual ~FmSearchDialog();
     virtual void dispose() SAL_OVERRIDE;
@@ -119,7 +119,7 @@ public:
         This handler MUST be set.
         Furthermore, it should be considered, that during the handler the search-dialog is still modal.
     */
-    void SetFoundHandler(const Link& lnk) { m_lnkFoundHandler = lnk; }
+    void SetFoundHandler(const Link<>& lnk) { m_lnkFoundHandler = lnk; }
     /**
         If the search has been cancelled or has been finished without success, the current data set is always displayed in the
         search dialog. This handler exists to make this synchronous with the possible display of the caller (it does not
@@ -127,7 +127,7 @@ public:
         The pointer that is passed to the handler points to a FmFoundRecordInformation-structure, for which aPosition and
         possibly (in a search with contexts) nContext are valid.
     */
-    void SetCanceledNotFoundHdl(const Link& lnk) { m_lnkCanceledNotFoundHdl = lnk; }
+    void SetCanceledNotFoundHdl(const Link<>& lnk) { m_lnkCanceledNotFoundHdl = lnk; }
 
     inline void SetActiveField(const OUString& strField);
 
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index a1855b1a1fdd..e58997fb5d93 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -99,7 +99,7 @@ public:
                         DECL_LINK( CleanUpHdl, void* );
 
     virtual short       Execute() SAL_OVERRIDE;
-    virtual void        StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+    virtual void        StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
     void                SetFileType( const OUString& rType ) { m_pFtSearchType->SetText( rType ); }
     void                SetDirectory( const INetURLObject& rURL ) { m_pFtSearchDir->SetText( GetReducedString( rURL, 30 ) ); }
 };
@@ -146,7 +146,7 @@ public:
 
     void                SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); }
     virtual short       Execute() SAL_OVERRIDE;
-    virtual void        StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE;
+    virtual void        StartExecuteModal( const Link<>& rEndDialogHdl ) SAL_OVERRIDE;
 };
 
 class ActualizeProgress : public ModalDialog
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 888060e2ecf3..0f2048862526 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -36,7 +36,7 @@ class GraphicPreviewWindow : public Control
 {
 private:
     const Graphic* mpOrigGraphic;
-    Link      maModifyHdl;
+    Link<>    maModifyHdl;
     Graphic   maScaledOrig;
     Graphic   maPreview;
     double    mfScaleX;
@@ -51,7 +51,7 @@ private:
 public:
 
     GraphicPreviewWindow(vcl::Window* pParent, WinBits nStyle);
-    void init(const Graphic* pOrigGraphic, const Link& rLink)
+    void init(const Graphic* pOrigGraphic, const Link<>& rLink)
     {
         mpOrigGraphic = pOrigGraphic;
         maModifyHdl = rLink;
@@ -69,7 +69,7 @@ class GraphicFilterDialog : public ModalDialog
 private:
 
     Timer           maTimer;
-    Link            maModifyHdl;
+    Link<>          maModifyHdl;
     Size            maSizePixel;
     bool            bIsBitmap;
 
@@ -79,7 +79,7 @@ private:
 protected:
     VclPtr<GraphicPreviewWindow>  mpPreview;
 
-    const Link&     GetModifyHdl() const { return maModifyHdl; }
+    const Link<>&   GetModifyHdl() const { return maModifyHdl; }
     const Size&     GetGraphicSizePixel() const { return maSizePixel; }
 
 public:
@@ -202,14 +202,14 @@ public:
 class EmbossControl : public SvxRectCtl
 {
 private:
-    Link            maModifyHdl;
+    Link<>          maModifyHdl;
     virtual void    MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE;
     virtual Size    GetOptimalSize() const SAL_OVERRIDE;
 public:
     EmbossControl(vcl::Window* pParent)
         : SvxRectCtl(pParent) {}
 
-    void            SetModifyHdl( const Link& rHdl ) { maModifyHdl = rHdl; }
+    void            SetModifyHdl( const Link<>& rHdl ) { maModifyHdl = rHdl; }
 };
 
 class GraphicFilterEmboss : public GraphicFilterDialog
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 8615477f6618..644b441db613 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -34,7 +34,7 @@ private:
     VclPtr<Edit>           pEdtName;
     VclPtr<OKButton>       pBtnOK;
 
-    Link            aCheckNameHdl;
+    Link<>          aCheckNameHdl;
 
     DECL_LINK(ModifyHdl, void *);
 
@@ -60,7 +60,7 @@ public:
         @todo Remove the parameter bCheckImmediately and incorporate the 'true'
               behaviour as default.
      */
-    void    SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false )
+    void    SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false )
     {
         aCheckNameHdl = rLink;
         if ( bCheckImmediately )
@@ -83,7 +83,7 @@ private:
     VclPtr<OKButton>       pBtnOK;
 
     // callback link for name uniqueness
-    Link            aCheckNameHdl;
+    Link<>          aCheckNameHdl;
 
     DECL_LINK(ModifyHdl, void *);
 
@@ -97,7 +97,7 @@ public:
     void GetName(OUString& rName) {rName = pEdtName->GetText(); }
 
     // set handler
-    void SetCheckNameHdl(const Link& rLink, bool bCheckImmediately = false)
+    void SetCheckNameHdl(const Link<>& rLink, bool bCheckImmediately = false)
     {
         aCheckNameHdl = rLink;
 
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 2aa203c85319..3e7f38339cc9 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -58,7 +58,7 @@ namespace svx
 
         void DisplayListBox( bool bDisplayListBox );
 
-        void SetSelectHdl( const Link& rLink );
+        void SetSelectHdl( const Link<>& rLink );
 
         void Clear();
         void InsertEntry( const OUString& rStr );
@@ -92,7 +92,7 @@ namespace svx
         VclPtr<SuggestionSet> m_aValueSet;
         VclPtr<ListBox>  m_aListBox;
 
-        Link          m_aSelectLink;
+        Link<>        m_aSelectLink;
         bool          m_bInSelectionUpdate;
     };
 
@@ -131,8 +131,8 @@ namespace svx
             the document anymore. Some functionality must be disabled then */
         bool            m_bDocumentMode;
 
-        Link            m_aOptionsChangedLink;
-        Link            m_aClickByCharacterLink;
+        Link<>          m_aOptionsChangedLink;
+        Link<>          m_aClickByCharacterLink;
 
     public:
         HangulHanjaConversionDialog(
@@ -142,15 +142,15 @@ namespace svx
         virtual void dispose() SAL_OVERRIDE;
 
     public:
-        void    SetOptionsChangedHdl( const Link& _rHdl );
-        void    SetIgnoreHdl( const Link& _rHdl );
-        void    SetIgnoreAllHdl( const Link& _rHdl );
-        void    SetChangeHdl( const Link& _rHdl );
-        void    SetChangeAllHdl( const Link& _rHdl );
-
-        void    SetClickByCharacterHdl( const Link& _rHdl );
-        void    SetConversionFormatChangedHdl( const Link& _rHdl );
-        void    SetFindHdl( const Link& _rHdl );
+        void    SetOptionsChangedHdl( const Link<>& _rHdl );
+        void    SetIgnoreHdl( const Link<>& _rHdl );
+        void    SetIgnoreAllHdl( const Link<>& _rHdl );
+        void    SetChangeHdl( const Link<>& _rHdl );
+        void    SetChangeAllHdl( const Link<>& _rHdl );
+
+        void    SetClickByCharacterHdl( const Link<>& _rHdl );
+        void    SetConversionFormatChangedHdl( const Link<>& _rHdl );
+        void    SetFindHdl( const Link<>& _rHdl );
 
         OUString  GetCurrentString( ) const;
         void    SetCurrentString(
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 610c63b2f2f9..7995287a00ec 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -102,7 +102,7 @@ private:
     sal_uInt16 m_nPositionSizePageId;
     sal_uInt16 m_nCaptionPageId;
 
-    Link                aValidateLink;
+    Link<>              aValidateLink;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
 
@@ -111,7 +111,7 @@ public:
                             sal_uInt16 nAnchorTypes = 0);
 
     /// link for the Writer to validate positions
-    void SetValidateFramePosLink( const Link& rLink );
+    void SetValidateFramePosLink( const Link<>& rLink );
 };
 
 
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 78ce3f200d41..dae84fea1d13 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -85,7 +85,7 @@ public:
     void                    SetNumberFormatList( const SvxNumberInfoItem& rItem )
                                 { SetInfoItem( rItem ); }
 
-    void                    SetOkHdl( const Link& rOkHandler );
+    void                    SetOkHdl( const Link<>& rOkHandler );
     void                    HideLanguage(bool nFlag=true);
     virtual bool            PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
     virtual void            PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -123,7 +123,7 @@ private:
     SvxNumberInfoItem*      pNumItem;
     SvxNumberFormatShell*   pNumFmtShell;
     sal_uLong               nInitFormat;
-    Link                    fnOkHdl;
+    Link<>                  fnOkHdl;
 
     bool                bNumItemFlag; ///< for handling with DocShell
     bool                bOneAreaFlag;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 3bdffc3f0edd..398a1998ac81 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -78,7 +78,7 @@ public:
 
 class SvxDictEdit : public Edit
 {
-    Link    aActionLink;
+    Link<>  aActionLink;
     bool    bSpaces;
 
     public:
@@ -87,7 +87,7 @@ class SvxDictEdit : public Edit
                     SvxDictEdit(vcl::Window* pParent, WinBits aWB) :
                         Edit(pParent, aWB), bSpaces(false){}
 
-    void            SetActionHdl( const Link& rLink )
+    void            SetActionHdl( const Link<>& rLink )
                                 { aActionLink = rLink;}
 
     void            SetSpaces(bool bSet)
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 170e00692379..0c98b22ca2bd 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -51,11 +51,11 @@ public:
     static const sal_uInt16*      GetRanges();
     const SfxItemSet*   GetOutputItemSet() const { return pOutSet; }
 
-    Link                GetPrevHdl() const { return aPrevHdlLink; }
-    void                SetPrevHdl( const Link& rLink )
+    Link<>              GetPrevHdl() const { return aPrevHdlLink; }
+    void                SetPrevHdl( const Link<>& rLink )
                             { aPrevHdlLink = rLink; }
-    Link                GetNextHdl() const { return aNextHdlLink; }
-    void                SetNextHdl( const Link& rLink )
+    Link<>              GetNextHdl() const { return aNextHdlLink; }
+    void                SetNextHdl( const Link<>& rLink )
                             { aNextHdlLink = rLink; }
 
     void EnableTravel(bool bNext, bool bPrev);
@@ -103,8 +103,8 @@ private:
     const SfxItemSet&   rSet;
     SfxItemSet*         pOutSet;
 
-    Link                aPrevHdlLink;
-    Link                aNextHdlLink;
+    Link<>              aPrevHdlLink;
+    Link<>              aNextHdlLink;
 
     DECL_LINK(Stamp, void *);
     DECL_LINK(OKHdl, void *);
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index c1ac1e3f6b62..7f17f842c009 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -189,7 +189,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
     VclPtr<VclMultiLineEdit>               m_pDescriptionText;
     OUString                        m_sDefaultDesc;
     bool                        m_bShowSlots;
-    Link                            m_aAddHdl;
+    Link<>                          m_aAddHdl;
 
     DECL_LINK( ClickHdl, Button * );
     DECL_LINK( SelectHdl, Control* );
@@ -208,8 +208,8 @@ public:
     virtual ~SvxScriptSelectorDialog();
     virtual void dispose() SAL_OVERRIDE;
 
-    void        SetAddHdl( const Link& rLink ) { m_aAddHdl = rLink; }
-    const Link& GetAddHdl() const { return m_aAddHdl; }
+    void        SetAddHdl( const Link<>& rLink ) { m_aAddHdl = rLink; }
+    const Link<>& GetAddHdl() const { return m_aAddHdl; }
 
     void        SetImageProvider(ImageProvider* provider)
     {
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index e1db4048acc7..3be2b26fe0cd 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -68,7 +68,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
 
     VclPtr<SvxSwFrameExample> m_pExampleWN;
 
-    Link        m_aValidateLink;
+    Link<>      m_aValidateLink;
 
     //'string provider'
     SvxSwFramePosString m_aFramePosString;
@@ -136,7 +136,7 @@ public:
 
     void    EnableAnchorTypes(sal_uInt16 nAnchorEnable);
 
-    void SetValidateFramePosLink( const Link& rLink )
+    void SetValidateFramePosLink( const Link<>& rLink )
             {m_aValidateLink = rLink;}
 
     void SetView( const SdrView* pSdrView );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 52489521102e..2945d28e494c 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -53,7 +53,7 @@ private:
     const SdrView*      pView;
 
     sal_uInt16          nAnchorCtrls;
-    Link                aValidateLink;
+    Link<>              aValidateLink;
 
     virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
 
@@ -64,7 +64,7 @@ public:
                             sal_uInt16 nAnchorTypes = 0);
 
             //link for the Writer to validate positions
-            void SetValidateFramePosLink( const Link& rLink );
+            void SetValidateFramePosLink( const Link<>& rLink );
 };
 
 /*************************************************************************
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b162898bc97c..d6e32b4e0441 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -42,7 +42,7 @@ namespace offapp
         OUString                                m_sYes;
         OUString                                m_sNo;
 
-        Link                                    m_aRowChangeHandler;
+        Link<>                                  m_aRowChangeHandler;
 
     public:
         DriverListControl(vcl::Window* _pParent);
@@ -53,7 +53,7 @@ namespace offapp
 
         // the handler will be called with a DriverPoolingSettings::const_iterator as parameter,
         // or NULL if no valid current row exists
-        void SetRowChangeHandler(const Link& _rHdl) { m_aRowChangeHandler = _rHdl; }
+        void SetRowChangeHandler(const Link<>& _rHdl) { m_aRowChangeHandler = _rHdl; }
 
         DriverPooling* getCurrentRow();
         void                                    updateCurrentRow();
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index f4be898c5685..ea56e8eb10ba 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -47,7 +47,7 @@ namespace svx
 
         bool                m_bCreatingNew;
 
-        Link                    m_aNameValidator;
+        Link<>                  m_aNameValidator;
 
     public:
         ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew );
@@ -57,8 +57,8 @@ namespace svx
         // name validation has to be done by an external instance
         // the validator link gets a pointer to a String, and should return 0 if the string is not
         // acceptable
-        void    setNameValidator( const Link& _rValidator ) { m_aNameValidator = _rValidator; }
-        Link    getNameValidator( ) const { return m_aNameValidator; }
+        void    setNameValidator( const Link<>& _rValidator ) { m_aNameValidator = _rValidator; }
+        Link<>  getNameValidator( ) const { return m_aNameValidator; }
 
         void    setLink( const  OUString& _rName, const   OUString& _rURL );
         void    getLink(        OUString& _rName,         OUString& _rURL ) const;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 4276de7311b7..86b7ae073114 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -88,7 +88,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( vcl::Window* pParent,
     m_pCheckLB->setColSizes();
 
     aTextColor = m_pCheckLB->GetTextColor();
-    Link aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
+    Link<> aLink(LINK(this, SvxFontSubstTabPage, SelectHdl));
 
     m_pCheckLB->SetSelectHdl(aLink);
     m_pUseTableCB->SetClickHdl(aLink);
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index fd637a9b96b5..81d9a39266fc 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -142,7 +142,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet&
     LanguageHdl(m_pLanguageLB);
     m_pLanguageLB->SetSelectHdl(LINK(this, SvxAsianLayoutPage, LanguageHdl));
     m_pStandardCB->SetClickHdl(LINK(this, SvxAsianLayoutPage, ChangeStandardHdl));
-    Link aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
+    Link<> aLk(LINK(this, SvxAsianLayoutPage, ModifyHdl));
     m_pStartED->SetModifyHdl(aLk);
     m_pEndED->SetModifyHdl(aLk);
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index a8e8c8e9bed8..cbb8a5f6916d 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -178,7 +178,7 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
 public:
-    void SetLinks (Link const&, Link const&, Link const&);
+    void SetLinks (Link<> const&, Link<> const&, Link<> const&);
     unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); }
     void Update (EditableColorConfig const*, EditableExtendedColorConfig const*);
     void ScrollHdl(const ScrollBar&);
@@ -219,7 +219,7 @@ private:
         void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList);
         void SetTextColor (Color C) { m_pText->SetTextColor(C); }
     public:
-        void SetLinks (Link const&, Link const&, Link const&);
+        void SetLinks (Link<> const&, Link<> const&, Link<> const&);
         void Update (ColorConfigEntry, ColorConfigValue const&);
         void Update (ExtendedColorConfigValue const&);
         void ColorChanged (ColorConfigEntry, ColorConfigValue&);
@@ -409,8 +409,8 @@ void ColorConfigWindow_Impl::Entry::SetAppearance(
 
 // SetLinks()
 void ColorConfigWindow_Impl::Entry::SetLinks(
-    Link const& aCheckLink, Link const& aColorLink,
-    Link const& aGetFocusLink)
+    Link<> const& aCheckLink, Link<> const& aColorLink,
+    Link<> const& aGetFocusLink)
 {
     m_pColorList->SetSelectHdl(aColorLink);
     m_pColorList->SetGetFocusHdl(aGetFocusLink);
@@ -680,7 +680,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB)
 
 // SetLinks()
 void ColorConfigWindow_Impl::SetLinks (
-    Link const& aCheckLink, Link const& aColorLink, Link const& aGetFocusLink
+    Link<> const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink
 ) {
     for (unsigned i = 0; i != vEntries.size(); ++i)
         vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
@@ -886,13 +886,13 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent)
     m_pScrollWindow->set_expand(true);
     m_pScrollWindow->set_fill(true);
 
-    Link aScrollLink = LINK(this, ColorConfigCtrl_Impl, ScrollHdl);
+    Link<> aScrollLink = LINK(this, ColorConfigCtrl_Impl, ScrollHdl);
     m_pVScroll->SetScrollHdl(aScrollLink);
     m_pVScroll->SetEndScrollHdl(aScrollLink);
 
-    Link aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
-    Link aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
-    Link aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
+    Link<> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl);
+    Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl);
+    Link<> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl);
     m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink);
 
     m_pHeaderHB->Show();
@@ -1060,7 +1060,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
         get<vcl::Window>("preview")->GetText());
 
     m_pColorSchemeLB->SetSelectHdl(LINK(this, SvxColorOptionsTabPage, SchemeChangedHdl_Impl));
-    Link aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
+    Link<> aLk = LINK(this, SvxColorOptionsTabPage, SaveDeleteHdl_Impl );
     m_pSaveSchemePB->SetClickHdl(aLk);
     m_pDeleteSchemePB->SetClickHdl(aLk);
 }
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 0949203066d1..c4f84c496e28 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -294,7 +294,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
 
     m_aStrDateInfo = m_pToYearFT->GetText();
     m_pYearValueField->SetModifyHdl( LINK( this, OfaMiscTabPage, TwoFigureHdl ) );
-    Link aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl );
+    Link<> aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl );
     m_pYearValueField->SetDownHdl( aLink );
     m_pYearValueField->SetUpHdl( aLink );
     m_pYearValueField->SetLoseFocusHdl( aLink );
@@ -1225,7 +1225,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet&
     m_pLocaleSettingLB->SetSelectHdl( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) );
     m_pDatePatternsED->SetModifyHdl( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) );
 
-    Link aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
+    Link<> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
     m_pAsianSupportCB->SetClickHdl( aLink );
     m_pCTLSupportCB->SetClickHdl( aLink );
 
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index babda6a7ce8e..27052c736ebd 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -293,7 +293,7 @@ void SvxGeneralTabPage::InitControls ()
 void SvxGeneralTabPage::SetLinks ()
 {
     // link for updating the initials
-    Link aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
+    Link<> aLink = LINK( this, SvxGeneralTabPage, ModifyHdl_Impl );
     Row& rNameRow = *vRows[nNameRow];
     for (unsigned i = rNameRow.nFirstField; i != rNameRow.nLastField - 1; ++i)
         vFields[i]->pEdit->SetModifyHdl(aLink);
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 48e2626a31ec..ad149150abd7 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -189,7 +189,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pNoProxyForED, "noproxy");
     get(m_pNoProxyDescFT, "noproxydesc");
 
-    Link aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl );
+    Link<> aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl );
     m_pHttpPortED->SetLoseFocusHdl( aLink );
     m_pHttpsPortED->SetLoseFocusHdl( aLink );
     m_pFtpPortED->SetLoseFocusHdl( aLink );
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 468f56eeed0e..218f814e97fb 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -206,7 +206,7 @@ SvxPathTabPage::SvxPathTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     get(m_pPathCtrl, "paths");
 
     m_pStandardBtn->SetClickHdl(LINK(this, SvxPathTabPage, StandardHdl_Impl));
-    Link aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
+    Link<> aLink = LINK( this, SvxPathTabPage, PathHdl_Impl );
     m_pPathBtn->SetClickHdl( aLink );
 
     Size aControlSize(236 , 147);
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a57f3e0dca35..f6c5741dadb0 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -118,7 +118,7 @@ SfxSaveTabPage::SfxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet
     aDocTypeLB->SetEntryData(5, reinterpret_cast<void*>(APP_DRAW)         );
     aDocTypeLB->SetEntryData(6, reinterpret_cast<void*>(APP_MATH)         );
 
-    Link aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
+    Link<> aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
     aAutoSaveCB->SetClickHdl( aLink );
     aAutoSaveEdit->SetMaxTextLen( 2 );
 
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 8d7329fe19b1..0f19eefbd00d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -203,7 +203,7 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor
     // windows to be disabled, if stacked text is turned OFF
     m_pOrientHlp->AddDependentWindow( *m_pCbAsianMode,  TRISTATE_FALSE );
 
-    Link aLink = LINK( this, AlignmentTabPage, UpdateEnableHdl );
+    Link<> aLink = LINK( this, AlignmentTabPage, UpdateEnableHdl );
 
     m_pLbHorAlign->SetSelectHdl( aLink );
     m_pBtnWrap->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index dfc5ba5ad107..c2a24866e812 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -424,7 +424,7 @@ void SvxCharNamePage::Initialize()
     // to handle the changes of the other pages
     SetExchangeSupport();
 
-    Link aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
+    Link<> aLink = LINK( this, SvxCharNamePage, FontModifyHdl_Impl );
     m_pWestFontNameLB->SetModifyHdl( aLink );
     m_pWestFontStyleLB->SetModifyHdl( aLink );
     m_pWestFontSizeLB->SetModifyHdl( aLink );
@@ -1474,7 +1474,7 @@ void SvxCharEffectsPage::Initialize()
     m_pFontColorLB->SetSelectHdl( LINK( this, SvxCharEffectsPage, ColorBoxSelectHdl_Impl ) );
 
     // handler
-    Link aLink = LINK( this, SvxCharEffectsPage, SelectHdl_Impl );
+    Link<> aLink = LINK( this, SvxCharEffectsPage, SelectHdl_Impl );
     m_pUnderlineLB->SetSelectHdl( aLink );
     m_pUnderlineColorLB->SetSelectHdl( aLink );
     m_pOverlineLB->SetSelectHdl( aLink );
@@ -2696,7 +2696,7 @@ void SvxCharPositionPage::Initialize()
     m_pKerningLB->SelectEntryPos( 0 );
     KerningSelectHdl_Impl( NULL );
 
-    Link aLink = LINK( this, SvxCharPositionPage, PositionHdl_Impl );
+    Link<> aLink = LINK( this, SvxCharPositionPage, PositionHdl_Impl );
     m_pHighPosBtn->SetClickHdl( aLink );
     m_pNormalPosBtn->SetClickHdl( aLink );
     m_pLowPosBtn->SetClickHdl( aLink );
@@ -3182,8 +3182,8 @@ void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
         m_pScalingAndRotationFT->Show();
         m_pScalingFT->Hide();
 
-        Link aOldLink( m_pFitToLineCB->GetClickHdl() );
-        m_pFitToLineCB->SetClickHdl( Link() );
+        Link<> aOldLink( m_pFitToLineCB->GetClickHdl() );
+        m_pFitToLineCB->SetClickHdl( Link<>() );
         if( eState >= SfxItemState::DEFAULT )
         {
             const SvxCharRotateItem& rItem =
@@ -3432,7 +3432,7 @@ void SvxCharTwoLinesPage::Initialize()
 
     m_pTwoLinesBtn->SetClickHdl( LINK( this, SvxCharTwoLinesPage, TwoLinesHdl_Impl ) );
 
-    Link aLink = LINK( this, SvxCharTwoLinesPage, CharacterMapHdl_Impl );
+    Link<> aLink = LINK( this, SvxCharTwoLinesPage, CharacterMapHdl_Impl );
     m_pStartBracketLB->SetSelectHdl( aLink );
     m_pEndBracketLB->SetSelectHdl( aLink );
 
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 66b493516fc1..21fa98fa7fc2 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -120,7 +120,7 @@ SvxConnectionPage::SvxConnectionPage( vcl::Window* pWindow, const SfxItemSet& rI
     // disable 3D border
     m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO);
 
-    Link aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) );
+    Link<> aLink( LINK( this, SvxConnectionPage, ChangeAttrHdl_Impl ) );
     m_pMtrFldHorz1->SetModifyHdl( aLink );
     m_pMtrFldVert1->SetModifyHdl( aLink );
     m_pMtrFldHorz2->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 47350ce2ecee..035ddab252c1 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -88,7 +88,7 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet )
     SetFieldUnit( *m_pTopMF , eMetric );
     SetFieldUnit( *m_pBottomMF, eMetric );
 
-    Link aLk = LINK(this, SvxGrfCropPage, SizeHdl);
+    Link<> aLk = LINK(this, SvxGrfCropPage, SizeHdl);
     m_pWidthMF->SetModifyHdl( aLk );
     m_pHeightMF->SetModifyHdl( aLk );
 
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 1f053174161f..3e0ae6245af1 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -571,7 +571,7 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
 }
 
-void SvxCaptionTabDialog::SetValidateFramePosLink( const Link& rLink )
+void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<>& rLink )
 {
     aValidateLink = rLink;
 }
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 9c384f04800d..0cb8a54cd527 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -369,7 +369,7 @@ void _SfxMacroTabPage::InitAndSetHandler()
 {
     SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
     HeaderBar&          rHeaderBar = mpImpl->pEventLB->GetHeaderBar();
-    Link                aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
+    Link<>              aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl ));
     mpImpl->pMacroLB->SetDoubleClickHdl( aLnk );
     mpImpl->pDeletePB->SetClickHdl( aLnk );
     mpImpl->pAssignPB->SetClickHdl( aLnk );
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 0f4213da4a2d..0e83582080fe 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -135,7 +135,7 @@ SvxMeasurePage::SvxMeasurePage( vcl::Window* pWindow, const SfxItemSet& rInAttrs
     m_pCtlPreview->SetBackground ( rStyles.GetWindowColor() );
     m_pCtlPreview->SetBorderStyle(WindowBorderStyle::MONO);
 
-    Link aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) );
+    Link<> aLink( LINK( this, SvxMeasurePage, ChangeAttrHdl_Impl ) );
     m_pMtrFldLineDist->SetModifyHdl( aLink );
     m_pMtrFldHelplineOverhang->SetModifyHdl( aLink );
     m_pMtrFldHelplineDist->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 9ddc402a6291..be2ab716a598 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -336,7 +336,7 @@ void SvxNumberFormatTabPage::Init_Impl()
     m_pCbSourceFormat->Disable();
     m_pCbSourceFormat->Hide();
 
-    Link aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
+    Link<> aLink = LINK( this, SvxNumberFormatTabPage, SelFormatHdl_Impl );
 
     m_pLbCategory->SetSelectHdl( aLink );
     m_pLbFormat->SetSelectHdl( aLink );
@@ -1689,7 +1689,7 @@ bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt )
 #*
 #************************************************************************/
 
-void SvxNumberFormatTabPage::SetOkHdl( const Link& rOkHandler )
+void SvxNumberFormatTabPage::SetOkHdl( const Link<>& rOkHandler )
 {
     fnOkHdl = rOkHandler;
 }
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7ef25525ffeb..c638187edb52 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2719,7 +2719,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
     }
     m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() );
 
-    Link aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl);
+    Link<> aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl);
 
     m_pDistBorderMF->SetUpHdl(aLk);
     m_pDistBorderMF->SetDownHdl(aLk);
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df8eb1032ac2..590676cffb09 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -423,7 +423,7 @@ void SvxPageDescPage::Init_Impl()
     m_pLandscapeBtn->SetClickHdl(     LINK( this, SvxPageDescPage, SwapOrientation_Impl ) );
     m_pPortraitBtn->SetClickHdl(      LINK( this, SvxPageDescPage, SwapOrientation_Impl ) );
 
-    Link aLink = LINK( this, SvxPageDescPage, BorderModify_Impl );
+    Link<> aLink = LINK( this, SvxPageDescPage, BorderModify_Impl );
     m_pLeftMarginEdit->SetModifyHdl( aLink );
     m_pRightMarginEdit->SetModifyHdl( aLink );
     m_pTopMarginEdit->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 0d2dc16b4992..72c80d8506a6 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -834,7 +834,7 @@ void SvxStdParagraphTabPage::Init_Impl()
     m_pLineDist->SetSelectHdl(
         LINK( this, SvxStdParagraphTabPage, LineDistHdl_Impl ) );
 
-    Link aLink = LINK( this, SvxStdParagraphTabPage, ELRLoseFocusHdl );
+    Link<> aLink = LINK( this, SvxStdParagraphTabPage, ELRLoseFocusHdl );
     m_pFLineIndent->SetLoseFocusHdl( aLink );
     m_pLeftIndent->SetLoseFocusHdl( aLink );
     m_pRightIndent->SetLoseFocusHdl( aLink );
@@ -1018,7 +1018,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet
     if ( m_pLastLineLB->GetEntryCount() == LASTLINECOUNT_NEW )
         m_pLastLineLB->RemoveEntry( nLastLinePos );
 
-    Link aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
+    Link<> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl );
     m_pLeft->SetClickHdl( aLink );
     m_pRight->SetClickHdl( aLink );
     m_pCenter->SetClickHdl( aLink );
@@ -2171,7 +2171,7 @@ SvxAsianTabPage::SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet )
     get(m_pHangingPunctCB,"checkHangPunct");
     get(m_pScriptSpaceCB,"checkApplySpacing");
 
-    Link aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl );
+    Link<> aLink = LINK( this, SvxAsianTabPage, ClickHdl_Impl );
     m_pHangingPunctCB->SetClickHdl( aLink );
     m_pScriptSpaceCB->SetClickHdl( aLink );
     m_pForbiddenRulesCB->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 64c9085f0a35..2b5652759297 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -558,7 +558,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet&
 
     SetExchangeSupport();
 
-    Link aLk = LINK(this, SvxSwPosSizeTabPage, RangeModifyHdl);
+    Link<> aLk = LINK(this, SvxSwPosSizeTabPage, RangeModifyHdl);
     m_pWidthMF->SetLoseFocusHdl( aLk );
     m_pHeightMF->SetLoseFocusHdl( aLk );
     m_pHoriByMF->SetLoseFocusHdl( aLk );
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 30f2f71dc353..1014873898ef 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -160,7 +160,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( vcl::Window* pParent, const SfxItemSet
     m_pDelBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelHdl_Impl ) );
     m_pDelAllBtn->SetClickHdl( LINK( this,SvxTabulatorTabPage, DelAllHdl_Impl ) );
 
-    Link aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
+    Link<> aLink = LINK( this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl );
     m_pLeftTab->SetClickHdl( aLink );
     m_pRightTab->SetClickHdl( aLink );
     m_pDezTab->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index b2f2980de258..eb58430b65b1 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -115,7 +115,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( vcl::Window* pWindow, const SfxItemS
     m_pTsbAuto->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickAutoHdl_Impl ) );
     m_pTsbPixel->SetClickHdl( LINK( this, SvxTextAnimationPage, ClickPixelHdl_Impl ) );
 
-    Link aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
+    Link<> aLink( LINK( this, SvxTextAnimationPage, ClickDirectionHdl_Impl ) );
     m_pBtnUp->SetClickHdl( aLink );
     m_pBtnLeft->SetClickHdl( aLink );
     m_pBtnRight->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 9d7a3af424f9..645b2472f8ac 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -87,7 +87,7 @@ SvxTextAttrPage::SvxTextAttrPage(vcl::Window* pWindow, const SfxItemSet& rInAttr
     SetFieldUnit( *m_pMtrFldTop, eFUnit );
     SetFieldUnit( *m_pMtrFldBottom, eFUnit );
 
-    Link aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
+    Link<> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) );
     m_pTsbAutoGrowWidth->SetClickHdl( aLink );
     m_pTsbAutoGrowHeight->SetClickHdl( aLink );
     m_pTsbFitToSize->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 1b73f2c0dcad..a0a7abbf0db2 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -301,7 +301,7 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt
     m_pMtrTrgrEndValue->SetValue( 100 );
     m_pMtrTrgrStartValue->SetValue( 0 );
     m_pLbTrgrGradientType->SetSelectHdl(LINK(this, SvxTransparenceTabPage, ChangeTrgrTypeHdl_Impl));
-    Link aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl);
+    Link<> aLink = LINK( this, SvxTransparenceTabPage, ModifiedTrgrHdl_Impl);
     m_pLbTrgrGradientType->SetSelectHdl( aLink );
     m_pMtrTrgrCenterX->SetModifyHdl( aLink );
     m_pMtrTrgrCenterY->SetModifyHdl( aLink );
@@ -755,7 +755,7 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
     m_pTsbStepCount->SetClickHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
     m_pNumFldStepCount->SetModifyHdl( LINK( this, SvxAreaTabPage, ModifyStepCountHdl_Impl ) );
 
-    Link aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
+    Link<> aLink( LINK( this, SvxAreaTabPage, ModifyTileHdl_Impl ) );
     m_pTsbTile->SetClickHdl( aLink );
     m_pTsbStretch->SetClickHdl( aLink );
     m_pTsbOriginal->SetClickHdl( aLink );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 61f10283f2b6..048e4585e931 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -376,7 +376,7 @@ SvxColorTabPage::SvxColorTabPage(vcl::Window* pParent, const SfxItemSet& rInAttr
     m_pLbColorModel->SetSelectHdl(
         LINK( this, SvxColorTabPage, SelectColorModelHdl_Impl ) );
 
-    Link aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
+    Link<> aLink = LINK( this, SvxColorTabPage, ModifiedHdl_Impl );
     m_pR->SetModifyHdl( aLink );
     m_pG->SetModifyHdl( aLink );
     m_pB->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 81ce6469117e..00d434055158 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -117,7 +117,7 @@ SvxGradientTabPage::SvxGradientTabPage
     m_pBtnDelete->SetClickHdl(
         LINK( this, SvxGradientTabPage, ClickDeleteHdl_Impl ) );
 
-    Link aLink = LINK( this, SvxGradientTabPage, ModifiedHdl_Impl );
+    Link<> aLink = LINK( this, SvxGradientTabPage, ModifiedHdl_Impl );
     m_pLbGradientType->SetSelectHdl( aLink );
     m_pMtrCenterX->SetModifyHdl( aLink );
     m_pMtrCenterY->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 4e1200e963ad..e4ee4544b4cc 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -118,7 +118,7 @@ SvxHatchTabPage::SvxHatchTabPage
 
     m_pLbHatchings->SetSelectHdl( LINK( this, SvxHatchTabPage, ChangeHatchHdl_Impl ) );
 
-    Link aLink = LINK( this, SvxHatchTabPage, ModifiedHdl_Impl );
+    Link<> aLink = LINK( this, SvxHatchTabPage, ModifiedHdl_Impl );
     m_pMtrDistance->SetModifyHdl( aLink );
     m_pMtrAngle->SetModifyHdl( aLink );
     m_pLbLineType->SetSelectHdl( aLink );
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index bdc91ac2793f..184d428732a1 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -189,8 +189,8 @@ SvxLineTabPage::SvxLineTabPage
     m_pMtrLineWidth->SetModifyHdl( LINK( this, SvxLineTabPage, ChangePreviewHdl_Impl ) );
     m_pMtrTransparent->SetModifyHdl( LINK( this, SvxLineTabPage, ChangeTransparentHdl_Impl ) );
 
-    Link aStart = LINK( this, SvxLineTabPage, ChangeStartHdl_Impl );
-    Link aEnd = LINK( this, SvxLineTabPage, ChangeEndHdl_Impl );
+    Link<> aStart = LINK( this, SvxLineTabPage, ChangeStartHdl_Impl );
+    Link<> aEnd = LINK( this, SvxLineTabPage, ChangeEndHdl_Impl );
     m_pLbStartStyle->SetSelectHdl( aStart );
     m_pLbEndStyle->SetSelectHdl( aEnd );
     m_pMtrStartWidth->SetModifyHdl( aStart );
@@ -199,11 +199,11 @@ SvxLineTabPage::SvxLineTabPage
     m_pTsbCenterEnd->SetClickHdl( aEnd );
 
     // #116827#
-    Link aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl );
+    Link<> aEdgeStyle = LINK( this, SvxLineTabPage, ChangeEdgeStyleHdl_Impl );
     m_pLBEdgeStyle->SetSelectHdl( aEdgeStyle );
 
     // LineCaps
-    Link aCapStyle = LINK( this, SvxLineTabPage, ChangeCapStyleHdl_Impl );
+    Link<> aCapStyle = LINK( this, SvxLineTabPage, ChangeCapStyleHdl_Impl );
     m_pLBCapStyle->SetSelectHdl( aCapStyle );
 
     // Symbols on a line (eg star charts), MB-handler set
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index c2448b280d57..8bac22399f6b 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -143,7 +143,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
     m_pCbxSynchronize->SetClickHdl(  LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
 
     // preview must be updated when there's something changed
-    Link aLink = LINK( this, SvxLineDefTabPage, SelectTypeHdl_Impl );
+    Link<> aLink = LINK( this, SvxLineDefTabPage, SelectTypeHdl_Impl );
     m_pLbType1->SetSelectHdl( aLink );
     m_pLbType2->SetSelectHdl( aLink );
     aLink = LINK( this, SvxLineDefTabPage, ChangePreviewHdl_Impl );
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 55d66b3b75ab..10c0d0cf8aba 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -159,7 +159,7 @@ SvxShadowTabPage::SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInA
     //aCtlXRectPreview.SetFillAttr( aXFillAttr );
 
     m_pTsbShowShadow->SetClickHdl( LINK( this, SvxShadowTabPage, ClickShadowHdl_Impl ) );
-    Link aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl );
+    Link<> aLink = LINK( this, SvxShadowTabPage, ModifyShadowHdl_Impl );
     m_pLbShadowColor->SetSelectHdl( aLink );
     m_pMtrTransparent->SetModifyHdl( aLink );
     m_pMtrDistance->SetModifyHdl( aLink );
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 2da50ac83e69..950a4b244827 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 
 
 
-void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
+void SvxTransformTabDialog::SetValidateFramePosLink(const Link<>& rLink)
 {
     aValidateLink = rLink;
 }