Remove _TYPED suffix from tools/link.hxx macros

...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.

Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c

31 files changed, 88 insertions, 88 deletions

diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index 6092d460fae2..830d885373b7 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -328,7 +328,7 @@ void AccessibleDialogWindow::SortChildren()
 }
 
 
-IMPL_LINK_TYPED( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void )
+IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void )
 {
     DBG_ASSERT(rEvent.GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!");
     if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VCLEVENT_OBJECT_DYING)
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 4ad9d08bae2f..23976945e3f8 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -88,7 +88,7 @@ private:
     SyntaxHighlighter   aHighlighter;
     Idle                aSyntaxIdle;
     std::set<sal_uInt16>       aSyntaxLineTable;
-    DECL_LINK_TYPED(SyntaxTimerHdl, Idle *, void);
+    DECL_LINK(SyntaxTimerHdl, Idle *, void);
 
     // progress bar
     class ProgressInfo;
@@ -233,10 +233,10 @@ protected:
     virtual void    Resize() override;
     virtual void    Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override;
 
-    DECL_LINK_TYPED( ButtonHdl, Button *, void );
-    DECL_LINK_TYPED(TreeListHdl, SvTreeListBox*, void);
-    DECL_LINK_TYPED( implEndDragHdl, HeaderBar *, void );
-    DECL_LINK_TYPED( EditAccHdl, Accelerator&, void );
+    DECL_LINK( ButtonHdl, Button *, void );
+    DECL_LINK(TreeListHdl, SvTreeListBox*, void);
+    DECL_LINK( implEndDragHdl, HeaderBar *, void );
+    DECL_LINK( EditAccHdl, Accelerator&, void );
 
 
 public:
@@ -281,7 +281,7 @@ private:
 
 protected:
     virtual void        Resize() override;
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
 
 public:
     explicit ComplexEditorWindow( ModulWindow* pParent );
@@ -494,8 +494,8 @@ public:
     virtual void dispose() override;
     void InsertSelectedEntry(); //insert the selected entry
 
-    DECL_LINK_TYPED(ImplDoubleClickHdl, ListBox&, void);
-    DECL_LINK_TYPED(ImplSelectHdl, ListBox&, void);
+    DECL_LINK(ImplDoubleClickHdl, ListBox&, void);
+    DECL_LINK(ImplSelectHdl, ListBox&, void);
 
 protected:
     virtual void KeyInput( const KeyEvent& rKeyEvt ) override;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 1c31380cb296..9b8eb6fc53e6 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1272,7 +1272,7 @@ void EditorWindow::DoDelayedSyntaxHighlight( sal_uLong nPara )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(EditorWindow, SyntaxTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(EditorWindow, SyntaxTimerHdl, Idle *, void)
 {
     DBG_ASSERT( pEditView, "Noch keine View, aber Syntax-Highlight ?!" );
 
@@ -1762,21 +1762,21 @@ void WatchWindow::RemoveSelectedWatch()
 }
 
 
-IMPL_LINK_TYPED( WatchWindow, ButtonHdl, Button *, pButton, void )
+IMPL_LINK( WatchWindow, ButtonHdl, Button *, pButton, void )
 {
     if (pButton == aRemoveWatchButton.get())
         if (SfxDispatcher* pDispatcher = GetDispatcher())
             pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
 }
 
-IMPL_LINK_NOARG_TYPED(WatchWindow, TreeListHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(WatchWindow, TreeListHdl, SvTreeListBox*, void)
 {
     SvTreeListEntry* pCurEntry = aTreeListBox->GetCurEntry();
     if ( pCurEntry && pCurEntry->GetUserData() )
         aXEdit->SetText( static_cast<WatchItem*>(pCurEntry->GetUserData())->maName );
 }
 
-IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void )
+IMPL_LINK_NOARG( WatchWindow, implEndDragHdl, HeaderBar *, void )
 {
     const sal_Int32 TAB_WIDTH_MIN = 10;
     sal_Int32 nMaxWidth =
@@ -1806,7 +1806,7 @@ IMPL_LINK_NOARG_TYPED( WatchWindow, implEndDragHdl, HeaderBar *, void )
     }
 }
 
-IMPL_LINK_TYPED( WatchWindow, EditAccHdl, Accelerator&, rAcc, void )
+IMPL_LINK( WatchWindow, EditAccHdl, Accelerator&, rAcc, void )
 {
     switch ( rAcc.GetCurKeyCode().GetCode() )
     {
@@ -2028,7 +2028,7 @@ void ComplexEditorWindow::Resize()
     aEWVScrollBar->SetPosSizePixel( Point( aOutSz.Width() - DWBORDER - nSBWidth, DWBORDER ), Size( nSBWidth, aSz.Height() ) );
 }
 
-IMPL_LINK_TYPED(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
+IMPL_LINK(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
 {
     if (aEdtWindow->GetEditView())
     {
@@ -2616,12 +2616,12 @@ void CodeCompleteListBox::dispose()
     ListBox::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void)
+IMPL_LINK_NOARG(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void)
 {
     InsertSelectedEntry();
 }
 
-IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplSelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl, ListBox&, void)
 {//give back the focus to the parent
     pCodeCompleteWindow->pParent->GrabFocus();
 }
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index c318fc67ba51..a7ef0e09f2e5 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -217,7 +217,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
 }
 
 
-IMPL_STATIC_LINK_TYPED(
+IMPL_STATIC_LINK(
     DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, pUndoAction, void )
 {
     // #i120515# pUndoAction needs to be deleted, this hand over is an ownership
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index e919ebe43ab2..2cea9d1d8b0b 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -437,7 +437,7 @@ void Shell::OuterResizePixel( const Point &rPos, const Size &rSize )
 }
 
 
-IMPL_LINK_TYPED( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void )
+IMPL_LINK( Shell, TabBarHdl, ::TabBar *, pCurTabBar, void )
 {
     sal_uInt16 nCurId = pCurTabBar->GetCurPageId();
     BaseWindow* pWin = aWindowTable[ nCurId ];
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 82a7ea2543dc..0f383e436b23 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -209,10 +209,10 @@ namespace
     class MacroExecution
     {
     public:
-        DECL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, void );
+        DECL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, void*, void );
     };
 
-    IMPL_STATIC_LINK_TYPED( MacroExecution, ExecuteMacroEvent, void*, p, void )
+    IMPL_STATIC_LINK( MacroExecution, ExecuteMacroEvent, void*, p, void )
     {
         MacroExecutionData* i_pData = static_cast<MacroExecutionData*>(p);
         ENSURE_OR_RETURN_VOID( i_pData, "wrong MacroExecutionData" );
diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx
index 5f946ca5a2c3..5c8892502489 100644
--- a/basctl/source/basicide/bastype3.hxx
+++ b/basctl/source/basicide/bastype3.hxx
@@ -34,9 +34,9 @@ private:
     Link<ExtendedEdit*,void>  aLoseFocusHdl;
 
 protected:
-    DECL_LINK_TYPED( EditAccHdl, Accelerator&, void );
-    DECL_LINK_TYPED( ImplGetFocusHdl, Control&, void );
-    DECL_LINK_TYPED( ImplLoseFocusHdl, Control&, void );
+    DECL_LINK( EditAccHdl, Accelerator&, void );
+    DECL_LINK( ImplGetFocusHdl, Control&, void );
+    DECL_LINK( ImplLoseFocusHdl, Control&, void );
 
 public:
                     ExtendedEdit( vcl::Window* pParent, IDEResId nRes );
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index fb57bc791ece..9bff85d0dd3b 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -90,7 +90,7 @@ void BaseWindow::GrabScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll )
 }
 
 
-IMPL_LINK_TYPED( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
+IMPL_LINK( BaseWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void )
 {
     DoScroll( pCurScrollBar );
 }
@@ -426,20 +426,20 @@ ExtendedEdit::ExtendedEdit( vcl::Window* pParent, IDEResId nRes ) :
     Control::SetLoseFocusHdl( LINK( this, ExtendedEdit, ImplLoseFocusHdl ) );
 }
 
-IMPL_LINK_NOARG_TYPED(ExtendedEdit, ImplGetFocusHdl, Control&, void)
+IMPL_LINK_NOARG(ExtendedEdit, ImplGetFocusHdl, Control&, void)
 {
     Application::InsertAccel( &aAcc );
     aLoseFocusHdl.Call( this );
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtendedEdit, ImplLoseFocusHdl, Control&, void)
+IMPL_LINK_NOARG(ExtendedEdit, ImplLoseFocusHdl, Control&, void)
 {
     Application::RemoveAccel( &aAcc );
 }
 
 
-IMPL_LINK_TYPED( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void )
+IMPL_LINK( ExtendedEdit, EditAccHdl, Accelerator&, rAcc, void )
 {
     aAccHdl.Call( rAcc );
 }
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 37c863b79823..5695a584b5d8 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -149,7 +149,7 @@ void BreakPointDialog::CheckButtons()
     }
 }
 
-IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
+IMPL_LINK( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
 {
     ::CheckBox * pChkBx = static_cast<::CheckBox*>(pButton);
     BreakPoint* pBrk = GetSelectedBreakPoint();
@@ -157,7 +157,7 @@ IMPL_LINK_TYPED( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
         pBrk->bEnabled = pChkBx->IsChecked();
 }
 
-IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
+IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
 {
     m_pNewButton->Disable();
     m_pOKButton->Enable();
@@ -170,7 +170,7 @@ IMPL_LINK_TYPED( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
 }
 
 
-IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
+IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
 {
     if (&rEdit == m_pComboBox)
         CheckButtons();
@@ -183,7 +183,7 @@ IMPL_LINK_TYPED( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
 }
 
 
-IMPL_LINK_TYPED( BreakPointDialog, ButtonHdl, Button *, pButton, void )
+IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton, void )
 {
     if (pButton == m_pOKButton)
     {
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index a3b0715f5f72..2a93ef2131e7 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -43,10 +43,10 @@ private:
 
 protected:
     void            CheckButtons();
-    DECL_LINK_TYPED( CheckBoxHdl, Button*, void );
-    DECL_LINK_TYPED( ComboBoxHighlightHdl, ComboBox&, void );
-    DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
-    DECL_LINK_TYPED( ButtonHdl, Button*, void );
+    DECL_LINK( CheckBoxHdl, Button*, void );
+    DECL_LINK( ComboBoxHighlightHdl, ComboBox&, void );
+    DECL_LINK( EditModifyHdl, Edit&, void );
+    DECL_LINK( ButtonHdl, Button*, void );
     void            UpdateFields( BreakPoint* pBrk );
     BreakPoint*     GetSelectedBreakPoint();
 
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 2ea8a295d113..eb0e6ddce679 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -170,7 +170,7 @@ void ExtraData::SetSearchItem (const SvxSearchItem& rItem)
     pSearchItem.reset(static_cast<SvxSearchItem*>(rItem.Clone()));
 }
 
-IMPL_STATIC_LINK_TYPED(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic, sal_uInt16)
+IMPL_STATIC_LINK(ExtraData, GlobalBasicBreakHdl, StarBASIC *, pBasic, sal_uInt16)
 {
     sal_uInt16 nRet = 0;
     if (Shell* pShell = GetShell())
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 896a870030c1..1409dc4cd958 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -48,7 +48,7 @@ private:
     bool            bShellInCriticalSection;
 
 protected:
-    DECL_STATIC_LINK_TYPED( ExtraData, GlobalBasicBreakHdl, StarBASIC *, sal_uInt16 );
+    DECL_STATIC_LINK( ExtraData, GlobalBasicBreakHdl, StarBASIC *, sal_uInt16 );
 
 public:
     ExtraData();
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx
index 50ba83481aa1..cf9430592734 100644
--- a/basctl/source/basicide/layout.cxx
+++ b/basctl/source/basicide/layout.cxx
@@ -362,7 +362,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect)
     }
 }
 
-IMPL_LINK_TYPED(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void)
+IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void)
 {
     // checking margins
     CheckMarginsFor(pSplitter);
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index aed300eef587..a14f9847ac0a 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -456,7 +456,7 @@ void MacroChooser::CheckButtons()
 }
 
 
-IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
+IMPL_LINK_NOARG(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
 {
     StoreMacroDescription();
     if (nMode == Recording)
@@ -470,7 +470,7 @@ IMPL_LINK_NOARG_TYPED(MacroChooser, MacroDoubleClickHdl, SvTreeListBox*, bool)
     return false;
 }
 
-IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
+IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
 {
     // Is also called if deselected!
     // Two function calls in every SelectHdl because
@@ -483,7 +483,7 @@ IMPL_LINK_TYPED( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox, void )
     }
 }
 
-IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
+IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
 {
     // Is also called if deselected!
     // Two function calls in every SelectHdl because
@@ -533,7 +533,7 @@ IMPL_LINK_TYPED( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void )
+IMPL_LINK_NOARG( MacroChooser, EditModifyHdl, Edit&, void )
 {
     // select the module in which the macro is put at Neu (new),
     // if BasicManager or Lib is selecting
@@ -590,7 +590,7 @@ IMPL_LINK_NOARG_TYPED( MacroChooser, EditModifyHdl, Edit&, void )
 }
 
 
-IMPL_LINK_TYPED( MacroChooser, ButtonHdl, Button *, pButton, void )
+IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton, void )
 {
     // apart from New/Record the Description is done by LoseFocus
     if (pButton == m_pRunButton)
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 28c3f9cb2028..052aa52edcaa 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -67,11 +67,11 @@ private:
 
     Mode                    nMode;
 
-    DECL_LINK_TYPED( MacroSelectHdl, SvTreeListBox *, void );
-    DECL_LINK_TYPED( MacroDoubleClickHdl, SvTreeListBox*, bool );
-    DECL_LINK_TYPED( BasicSelectHdl, SvTreeListBox *, void );
-    DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
-    DECL_LINK_TYPED( ButtonHdl, Button *, void );
+    DECL_LINK( MacroSelectHdl, SvTreeListBox *, void );
+    DECL_LINK( MacroDoubleClickHdl, SvTreeListBox*, bool );
+    DECL_LINK( BasicSelectHdl, SvTreeListBox *, void );
+    DECL_LINK( EditModifyHdl, Edit&, void );
+    DECL_LINK( ButtonHdl, Button *, void );
 
     void                CheckButtons();
     void                SaveSetCurEntry( SvTreeListBox& rBox, SvTreeListEntry* pEntry );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index a513944fed83..b4933cdb1c56 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -353,7 +353,7 @@ bool CheckBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewName )
 }
 
 // NewObjectDialog
-IMPL_LINK_NOARG_TYPED(NewObjectDialog, OkButtonHandler, Button*, void)
+IMPL_LINK_NOARG(NewObjectDialog, OkButtonHandler, Button*, void)
 {
     if (IsValidSbxName(m_pEdit->GetText()))
         EndDialog(1);
@@ -435,7 +435,7 @@ sal_Int32 GotoLineDialog::GetLineNumber() const
     return m_pEdit->GetText().toInt32();
 }
 
-IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void)
+IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler, Button*, void)
 {
     if ( GetLineNumber() )
         EndDialog(1);
@@ -444,7 +444,7 @@ IMPL_LINK_NOARG_TYPED(GotoLineDialog, OkButtonHandler, Button*, void)
 }
 
 // ExportDialog
-IMPL_LINK_NOARG_TYPED(ExportDialog, OkButtonHandler, Button*, void)
+IMPL_LINK_NOARG(ExportDialog, OkButtonHandler, Button*, void)
 {
     mbExportAsPackage = m_pExportAsPackageButton->IsChecked();
     EndDialog(1);
@@ -607,19 +607,19 @@ void LibPage::DeactivatePage()
 {
 }
 
-IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
+IMPL_LINK( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
 {
     if ( pBox->IsSelected( pBox->GetHdlEntry() ) )
         CheckButtons();
 }
 
-IMPL_LINK_NOARG_TYPED( LibPage, BasicSelectHdl, ListBox&, void )
+IMPL_LINK_NOARG( LibPage, BasicSelectHdl, ListBox&, void )
 {
     SetCurLib();
     CheckButtons();
 }
 
-IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
+IMPL_LINK( LibPage, ButtonHdl, Button *, pButton, void )
 {
     if (pButton == m_pEditButton)
     {
@@ -707,7 +707,7 @@ IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
     CheckButtons();
 }
 
-IMPL_LINK_TYPED( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool )
+IMPL_LINK( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg, bool )
 {
     bool bRet = false;
 
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 02daa5d69ebb..5a7ce994f70c 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -506,7 +506,7 @@ short OrganizeDialog::Execute()
     return TabDialog::Execute();
 }
 
-IMPL_LINK_TYPED( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
+IMPL_LINK( OrganizeDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
 {
     sal_uInt16 nId = pTabCtrl->GetCurPageId();
 
@@ -679,7 +679,7 @@ void ObjectPage::CheckButtons()
         m_pDelButton->Disable();
 }
 
-IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
+IMPL_LINK( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
 {
     if ( !pBox->IsSelected( pBox->GetHdlEntry() ) )
         return;
@@ -687,7 +687,7 @@ IMPL_LINK_TYPED( ObjectPage, BasicBoxHighlightHdl, SvTreeListBox*, pBox, void )
     CheckButtons();
 }
 
-IMPL_LINK_TYPED( ObjectPage, ButtonHdl, Button *, pButton, void )
+IMPL_LINK( ObjectPage, ButtonHdl, Button *, pButton, void )
 {
     if (pButton == m_pEditButton)
     {
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 074871fc503d..20a53ba782f1 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -51,7 +51,7 @@ private:
     VclPtr<Edit>           m_pEdit;
     VclPtr<OKButton>       m_pOKButton;
 
-    DECL_LINK_TYPED(OkButtonHandler, Button*, void);
+    DECL_LINK(OkButtonHandler, Button*, void);
 public:
     NewObjectDialog (vcl::Window* pParent, ObjectMode::Mode, bool bCheckName = false);
     virtual ~NewObjectDialog() override;
@@ -68,7 +68,7 @@ class GotoLineDialog : public ModalDialog
 {
     VclPtr<Edit>           m_pEdit;
     VclPtr<OKButton>       m_pOKButton;
-    DECL_LINK_TYPED(OkButtonHandler, Button*, void);
+    DECL_LINK(OkButtonHandler, Button*, void);
 public:
     explicit GotoLineDialog(vcl::Window * pParent);
     virtual ~GotoLineDialog() override;
@@ -84,7 +84,7 @@ private:
 
     bool            mbExportAsPackage;
 
-    DECL_LINK_TYPED(OkButtonHandler, Button*, void);
+    DECL_LINK(OkButtonHandler, Button*, void);
 
 public:
     explicit ExportDialog( vcl::Window * pParent );
@@ -178,7 +178,7 @@ public:
 
     virtual short   Execute() override;
 
-    DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void );
+    DECL_LINK( ActivatePageHdl, TabControl*, void );
 };
 
 class ObjectPage: public TabPage
@@ -190,8 +190,8 @@ protected:
     VclPtr<PushButton>         m_pNewDlgButton;
     VclPtr<PushButton>         m_pDelButton;
 
-    DECL_LINK_TYPED( BasicBoxHighlightHdl, SvTreeListBox*, void );
-    DECL_LINK_TYPED( ButtonHdl, Button *, void );
+    DECL_LINK( BasicBoxHighlightHdl, SvTreeListBox*, void );
+    DECL_LINK( ButtonHdl, Button *, void );
     void                CheckButtons();
     bool                GetSelection( ScriptDocument& rDocument, OUString& rLibName );
     void                DeleteCurrent();
@@ -229,10 +229,10 @@ protected:
     ScriptDocument      m_aCurDocument;
     LibraryLocation     m_eCurLocation;
 
-    DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void );
-    DECL_LINK_TYPED( BasicSelectHdl, ListBox&, void );
-    DECL_LINK_TYPED( ButtonHdl, Button *, void );
-    DECL_LINK_TYPED( CheckPasswordHdl, SvxPasswordDialog *, bool );
+    DECL_LINK( TreeListHighlightHdl, SvTreeListBox *, void );
+    DECL_LINK( BasicSelectHdl, ListBox&, void );
+    DECL_LINK( ButtonHdl, Button *, void );
+    DECL_LINK( CheckPasswordHdl, SvxPasswordDialog *, bool );
     void                CheckButtons();
     void                DeleteCurrent();
     void                NewLib();
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 157a2eb8ed0f..363f043465b9 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -575,7 +575,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect
 }
 
 
-IMPL_LINK_NOARG_TYPED(DlgEditor, MarkTimeout, Idle *, void)
+IMPL_LINK_NOARG(DlgEditor, MarkTimeout, Idle *, void)
 {
     rLayout.UpdatePropertyBrowser();
 }
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index d1df0c1f13bb..cb2fbc68660d 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -43,7 +43,7 @@ DlgEdFactory::~DlgEdFactory()
 }
 
 
-IMPL_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
+IMPL_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
 {
     static bool bNeedsInit = true;
     static uno::Reference< lang::XMultiServiceFactory > xDialogSFact;
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 491e3c523466..30a95a8541f4 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -27,7 +27,7 @@
 namespace basctl
 {
 
-IMPL_LINK_TYPED( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void )
+IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void )
 {
     (void)pTimer;
     vcl::Window& rWindow = rParent.GetWindow();
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 0716056fb000..ab6bb4818bc2 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -144,7 +144,7 @@ void ManageLanguageDialog::ClearLanguageBox()
     m_pLanguageLB->Clear();
 }
 
-IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void)
+IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void)
 {
     ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr );
     if ( RET_OK == aDlg->Execute() )
@@ -168,7 +168,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, AddHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
+IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void)
 {
     ScopedVclPtrInstance< MessageDialog > aQBox(this, "DeleteLangDialog", "modules/BasicIDE/ui/deletelangdialog.ui");
     if ( aQBox->Execute() == RET_OK )
@@ -197,7 +197,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
+IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, Button*, void)
 {
     const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos();
     LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos ));
@@ -214,7 +214,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, SelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void)
 {
     const sal_Int32 nCount = m_pLanguageLB->GetEntryCount();
     bool bEmpty = ( !nCount ||
diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx
index 714b96fbd277..1da0a2f905f0 100644
--- a/basctl/source/inc/accessibledialogwindow.hxx
+++ b/basctl/source/inc/accessibledialogwindow.hxx
@@ -95,7 +95,7 @@ protected:
     void                    UpdateChildren();
     void                    SortChildren();
 
-    DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void );
+    DECL_LINK( WindowEventListener, VclWindowEvent&, void );
 
     void            ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent );
     void            FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index 5c9fea0defac..35c4161c5a89 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -73,7 +73,7 @@ protected:
     virtual void        Command( const CommandEvent& rCEvt ) override;
     virtual void        LoseFocus() override;
 
-    DECL_STATIC_LINK_TYPED( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void );
+    DECL_STATIC_LINK( DialogWindow, NotifyUndoActionHdl, SdrUndoAction *, void );
     virtual void        DoInit() override;
     virtual void        DoScroll( ScrollBar* pCurScrollBar ) override;
     virtual void        DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx
index e756caa9f4f8..d6acd5c5578c 100644
--- a/basctl/source/inc/basidesh.hxx
+++ b/basctl/source/inc/basidesh.hxx
@@ -101,7 +101,7 @@ private:
 
     void                ImplStartListening( StarBASIC* pBasic );
 
-    DECL_LINK_TYPED( TabBarHdl, ::TabBar*, void );
+    DECL_LINK( TabBarHdl, ::TabBar*, void );
 
     static unsigned nShellCount;
 
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 8c668c344532..20f9f8f1471f 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -153,7 +153,7 @@ private:
     VclPtr<ScrollBar>      pShellHScrollBar;
     VclPtr<ScrollBar>      pShellVScrollBar;
 
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
     int nStatus;
 
     ScriptDocument      m_aDocument;
diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx
index 191d92910018..d4af255a843c 100644
--- a/basctl/source/inc/dlged.hxx
+++ b/basctl/source/inc/dlged.hxx
@@ -102,7 +102,7 @@ public:
     };
 
 private:
-    DECL_LINK_TYPED(MarkTimeout, Idle *, void);
+    DECL_LINK(MarkTimeout, Idle *, void);
 
     static void Print( Printer* pPrinter, const OUString& rTitle );
 
diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx
index a824921388f8..60bc4418ff8c 100644
--- a/basctl/source/inc/dlgedfac.hxx
+++ b/basctl/source/inc/dlgedfac.hxx
@@ -38,7 +38,7 @@ public:
     DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel );
     ~DlgEdFactory();
 
-    DECL_LINK_TYPED( MakeObject, SdrObjCreatorParams, SdrObject* );
+    DECL_LINK( MakeObject, SdrObjCreatorParams, SdrObject* );
 };
 
 } // namespace basctl
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index 7f198457ca7e..f4c64518bc03 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -35,7 +35,7 @@ protected:
     DlgEditor& rParent;
     Timer      aScrollTimer;
 
-    DECL_LINK_TYPED( ScrollTimeout, Timer *, void );
+    DECL_LINK( ScrollTimeout, Timer *, void );
     void    ForceScroll( const Point& rPos );
 
 public:
diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx
index 71e642d32b39..434b6b160856 100644
--- a/basctl/source/inc/layout.hxx
+++ b/basctl/source/inc/layout.hxx
@@ -121,7 +121,7 @@ private:
         Point MakePoint (long, long) const;
         Size MakeSize (long, long) const;
         static bool IsDocking (DockingWindow const&);
-        DECL_LINK_TYPED(SplitHdl, Splitter*, void);
+        DECL_LINK(SplitHdl, Splitter*, void);
         void CheckMarginsFor (Splitter*);
         void InitSplitter (Splitter&);
     } aLeftSide, aBottomSide;
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 3ccc75742fb2..a965416254a1 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -63,10 +63,10 @@ private:
     void                FillLanguageBox();
     void                ClearLanguageBox();
 
-    DECL_LINK_TYPED(AddHdl, Button*, void);
-    DECL_LINK_TYPED(DeleteHdl, Button*, void);
-    DECL_LINK_TYPED(MakeDefHdl, Button*, void);
-    DECL_LINK_TYPED(SelectHdl, ListBox&, void);
+    DECL_LINK(AddHdl, Button*, void);
+    DECL_LINK(DeleteHdl, Button*, void);
+    DECL_LINK(MakeDefHdl, Button*, void);
+    DECL_LINK(SelectHdl, ListBox&, void);
 
 public:
     ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> const & _pLMgr );