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

13 files changed, 76 insertions, 76 deletions

diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index f7e7e9265560..e4bc622a26ff 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -80,13 +80,13 @@ class Desktop : public Application
         virtual void            OverrideSystemSettings( AllSettings& rSettings ) override;
         virtual void            AppEvent( const ApplicationEvent& rAppEvent ) override;
 
-        DECL_LINK_TYPED( OpenClients_Impl, void*, void );
+        DECL_LINK( OpenClients_Impl, void*, void );
 
         static void             OpenClients();
         static void             OpenDefault();
         static void             CheckOpenCLCompute(const css::uno::Reference<css::frame::XDesktop2> &);
 
-        DECL_STATIC_LINK_TYPED( Desktop, EnableAcceptors_Impl, void*, void);
+        DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*, void);
 
         static void             HandleAppEvent( const ApplicationEvent& rAppEvent );
         static ResMgr*          GetDesktopResManager();
@@ -147,8 +147,8 @@ class Desktop : public Application
         void                    OpenSplashScreen();
         void                    CloseSplashScreen();
 
-        DECL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, bool );
-        DECL_STATIC_LINK_TYPED( Desktop, AsyncInitFirstRun, Timer*, void );
+        DECL_STATIC_LINK( Desktop, ImplInitFilterHdl, ::ConvertData&, bool );
+        DECL_STATIC_LINK( Desktop, AsyncInitFirstRun, Timer*, void );
         /** checks if the office is run the first time
             <p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the
             respective flag in the configuration is reset.</p>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1805d60450fd..3456db21e578 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1757,7 +1757,7 @@ int Desktop::doShutdown()
     return EXIT_SUCCESS;
 }
 
-IMPL_STATIC_LINK_TYPED( Desktop, ImplInitFilterHdl, ::ConvertData&, rData, bool )
+IMPL_STATIC_LINK( Desktop, ImplInitFilterHdl, ::ConvertData&, rData, bool )
 {
     return GraphicFilter::GetGraphicFilter().GetFilterCallback().Call( rData );
 }
@@ -1908,7 +1908,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
 }
 
 
-IMPL_STATIC_LINK_TYPED(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
+IMPL_STATIC_LINK(Desktop, AsyncInitFirstRun, Timer *, /*unused*/, void)
 {
     DoFirstRunInitializations();
 }
@@ -1928,7 +1928,7 @@ class ExitTimer : public Timer
     }
 };
 
-IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void)
+IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
 {
     try {
         // #i114963#
@@ -1965,7 +1965,7 @@ IMPL_LINK_NOARG_TYPED(Desktop, OpenClients_Impl, void*, void)
 }
 
 // enable acceptors
-IMPL_STATIC_LINK_NOARG_TYPED(Desktop, EnableAcceptors_Impl, void*, void)
+IMPL_STATIC_LINK_NOARG(Desktop, EnableAcceptors_Impl, void*, void)
 {
     enableAcceptors();
 }
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index aa0d0745560d..a5be36c03789 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -272,18 +272,18 @@ OUString CreateMD5FromString( const OUString& aMsg )
 class ProcessEventsClass_Impl
 {
 public:
-    DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, void );
-    DECL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void );
+    DECL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, void );
+    DECL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, void );
 };
 
-IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void )
+IMPL_STATIC_LINK( ProcessEventsClass_Impl, CallEvent, void*, pEvent, void )
 {
     // Application events are processed by the Desktop::HandleAppEvent implementation.
     Desktop::HandleAppEvent( *static_cast<ApplicationEvent*>(pEvent) );
     delete static_cast<ApplicationEvent*>(pEvent);
 }
 
-IMPL_STATIC_LINK_TYPED( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void )
+IMPL_STATIC_LINK( ProcessEventsClass_Impl, ProcessDocumentsEvent, void*, pEvent, void )
 {
     // Documents requests are processed by the RequestHandler implementation
     ProcessDocumentsRequest* pDocsRequest = static_cast<ProcessDocumentsRequest*>(pEvent);
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 7c14fb3170d9..fd15aae69031 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -128,11 +128,11 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
     MENU_COMMAND    ShowPopupMenu( const Point &rPos, const long nPos );
 
 
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
 
-    DECL_LINK_TYPED( HandleOptionsBtn, Button*, void );
-    DECL_LINK_TYPED( HandleEnableBtn, Button*, void );
-    DECL_LINK_TYPED( HandleRemoveBtn, Button*, void );
+    DECL_LINK( HandleOptionsBtn, Button*, void );
+    DECL_LINK( HandleEnableBtn, Button*, void );
+    DECL_LINK( HandleRemoveBtn, Button*, void );
 
 public:
     explicit ExtBoxWithBtns_Impl(vcl::Window* pParent);
@@ -466,7 +466,7 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable )
 }
 
 
-IMPL_LINK_TYPED( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void )
+IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void )
 {
     long nDelta = pScrBar->GetDelta();
 
@@ -482,7 +482,7 @@ IMPL_LINK_TYPED( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void)
+IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void)
 {
     const sal_Int32 nActive = getSelIndex();
 
@@ -501,7 +501,7 @@ IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleOptionsBtn, Button*, void)
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void)
+IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void)
 {
     const sal_Int32 nActive = getSelIndex();
 
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleEnableBtn, Button*, void)
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtBoxWithBtns_Impl, HandleRemoveBtn, Button*, void)
+IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn, Button*, void)
 {
     const sal_Int32 nActive = getSelIndex();
 
@@ -932,7 +932,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCancelBtn, Button*, void)
+IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn, Button*, void)
 {
     if ( m_xAbortChannel.is() )
     {
@@ -947,13 +947,13 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCancelBtn, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleCloseBtn, Button*, void)
+IMPL_LINK_NOARG(ExtMgrDialog, HandleCloseBtn, Button*, void)
 {
     Close();
 }
 
 
-IMPL_LINK_TYPED( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
+IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     bool bLockInterface = (bool) _bLockInterface;
@@ -1032,7 +1032,7 @@ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleAddBtn, Button*, void)
+IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn, Button*, void)
 {
     setBusy( true );
 
@@ -1046,7 +1046,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleAddBtn, Button*, void)
     setBusy( false );
 }
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleExtTypeCbx, Button*, void)
+IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, Button*, void)
 {
     // re-creates the list of packages with addEntry selecting the packages
     prepareChecking();
@@ -1054,7 +1054,7 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleExtTypeCbx, Button*, void)
     checkEntries();
 }
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleUpdateBtn, Button*, void)
+IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn, Button*, void)
 {
 #if ENABLE_EXTENSION_UPDATE
     m_pManager->checkUpdates( false, true );
@@ -1062,13 +1062,13 @@ IMPL_LINK_NOARG_TYPED(ExtMgrDialog, HandleUpdateBtn, Button*, void)
 }
 
 
-IMPL_LINK_TYPED( ExtMgrDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void )
+IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void )
 {
     openWebBrowser( rHyperlink.GetURL(), GetText() );
 }
 
 
-IMPL_LINK_NOARG_TYPED(ExtMgrDialog, TimeOutHdl, Idle *, void)
+IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Idle *, void)
 {
     if ( m_bStopProgress )
     {
@@ -1140,7 +1140,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
         return true;
 }
 
-IMPL_STATIC_LINK_NOARG_TYPED(ExtMgrDialog, Restart, void*, void)
+IMPL_STATIC_LINK_NOARG(ExtMgrDialog, Restart, void*, void)
 {
     SolarMutexGuard aGuard;
     ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
@@ -1264,7 +1264,7 @@ void UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac
 }
 
 
-IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void)
+IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn, Button*, void)
 {
     if ( m_xAbortChannel.is() )
     {
@@ -1280,7 +1280,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCancelBtn, Button*, void)
 }
 
 
-IMPL_LINK_TYPED( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void )
+IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface, void )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     bool bLockInterface = (bool) _bLockInterface;
@@ -1367,7 +1367,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::
 }
 
 
-IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleUpdateBtn, Button*, void)
+IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn, Button*, void)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -1386,7 +1386,7 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleUpdateBtn, Button*, void)
 }
 
 
-IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCloseBtn, Button*, void)
+IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn, Button*, void)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1402,13 +1402,13 @@ IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, HandleCloseBtn, Button*, void)
 }
 
 
-IMPL_LINK_TYPED( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void )
+IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void )
 {
     openWebBrowser( rHyperlink.GetURL(), GetText() );
 }
 
 
-IMPL_LINK_NOARG_TYPED(UpdateRequiredDialog, TimeOutHdl, Idle *, void)
+IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl, Idle *, void)
 {
     if ( m_bStopProgress )
     {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 801cdd264abe..39c406522c4f 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -132,15 +132,15 @@ class ExtMgrDialog : public ModelessDialog,
 
     bool removeExtensionWarn( const OUString &rExtensionTitle ) const;
 
-    DECL_LINK_TYPED( HandleAddBtn, Button*, void );
-    DECL_LINK_TYPED( HandleUpdateBtn, Button*, void );
-    DECL_LINK_TYPED( HandleCancelBtn, Button*, void );
-    DECL_LINK_TYPED( HandleCloseBtn, Button*, void );
-    DECL_LINK_TYPED( HandleExtTypeCbx, Button*, void );
-    DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
-    DECL_LINK_TYPED(TimeOutHdl, Idle *, void);
-    DECL_LINK_TYPED( startProgress, void *, void );
-    DECL_STATIC_LINK_TYPED( ExtMgrDialog, Restart, void *, void );
+    DECL_LINK( HandleAddBtn, Button*, void );
+    DECL_LINK( HandleUpdateBtn, Button*, void );
+    DECL_LINK( HandleCancelBtn, Button*, void );
+    DECL_LINK( HandleCloseBtn, Button*, void );
+    DECL_LINK( HandleExtTypeCbx, Button*, void );
+    DECL_LINK( HandleHyperlink, FixedHyperlink&, void );
+    DECL_LINK(TimeOutHdl, Idle *, void);
+    DECL_LINK( startProgress, void *, void );
+    DECL_STATIC_LINK( ExtMgrDialog, Restart, void *, void );
 
 public:
                     ExtMgrDialog( vcl::Window * pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
@@ -199,12 +199,12 @@ class UpdateRequiredDialog : public ModalDialog,
 
     css::uno::Reference< css::task::XAbortChannel > m_xAbortChannel;
 
-    DECL_LINK_TYPED( HandleUpdateBtn, Button*, void );
-    DECL_LINK_TYPED( HandleCloseBtn, Button*, void );
-    DECL_LINK_TYPED( HandleCancelBtn, Button*, void );
-    DECL_LINK_TYPED(TimeOutHdl, Idle *, void);
-    DECL_LINK_TYPED( startProgress, void *, void );
-    DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
+    DECL_LINK( HandleUpdateBtn, Button*, void );
+    DECL_LINK( HandleCloseBtn, Button*, void );
+    DECL_LINK( HandleCancelBtn, Button*, void );
+    DECL_LINK(TimeOutHdl, Idle *, void);
+    DECL_LINK( startProgress, void *, void );
+    DECL_LINK( HandleHyperlink, FixedHyperlink&, void );
 
     static bool     isEnabled( const css::uno::Reference< css::deployment::XPackage > &xPackage );
     static bool     checkDependencies( const css::uno::Reference< css::deployment::XPackage > &xPackage );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 445a7fa67e3f..375512bfc939 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1178,7 +1178,7 @@ void ExtensionBox_Impl::DoScroll( long nDelta )
 }
 
 
-IMPL_LINK_TYPED( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar, void )
+IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar, void )
 {
     DoScroll( pScrBar->GetDelta() );
 }
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index f20153eae304..403311fb5073 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -163,7 +163,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox
     void DeleteRemoved();
 
 
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
 
     void Init();
 public:
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index edac3f0cb38e..caf95d46c575 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1137,7 +1137,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore,
 }
 
 
-IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void)
+IMPL_LINK_NOARG(UpdateDialog, selectionHandler, SvTreeListBox*, void)
 {
     OUStringBuffer b;
     UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(
@@ -1235,7 +1235,7 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, selectionHandler, SvTreeListBox*, void)
     showDescription( b.makeStringAndClear() );
 }
 
-IMPL_LINK_NOARG_TYPED(UpdateDialog, allHandler, CheckBox&, void)
+IMPL_LINK_NOARG(UpdateDialog, allHandler, CheckBox&, void)
 {
     if (m_pAll->IsChecked())
     {
@@ -1277,7 +1277,7 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, allHandler, CheckBox&, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(UpdateDialog, okHandler, Button*, void)
+IMPL_LINK_NOARG(UpdateDialog, okHandler, Button*, void)
 {
     //If users are going to update a shared extension then we need
     //to warn them
@@ -1302,13 +1302,13 @@ IMPL_LINK_NOARG_TYPED(UpdateDialog, okHandler, Button*, void)
     EndDialog(RET_OK);
 }
 
-IMPL_LINK_NOARG_TYPED(UpdateDialog, closeHandler, Button*, void)
+IMPL_LINK_NOARG(UpdateDialog, closeHandler, Button*, void)
 {
     m_thread->stop();
     EndDialog();
 }
 
-IMPL_LINK_TYPED( UpdateDialog, hyperlink_clicked, FixedHyperlink&, rHyperlink, void )
+IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink&, rHyperlink, void )
 {
     OUString sURL = rHyperlink.GetURL();
     if ( sURL.isEmpty() )
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index 910d662a32ef..2662a41beb11 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -159,11 +159,11 @@ private:
         css::xml::dom::XNode > const & aUpdateInfo);
     bool showDescription( const OUString& rDescription);
 
-    DECL_LINK_TYPED(selectionHandler, SvTreeListBox*, void);
-    DECL_LINK_TYPED(allHandler, CheckBox&, void);
-    DECL_LINK_TYPED(okHandler, Button*, void);
-    DECL_LINK_TYPED(closeHandler, Button*, void);
-    DECL_LINK_TYPED(hyperlink_clicked, FixedHyperlink&, void);
+    DECL_LINK(selectionHandler, SvTreeListBox*, void);
+    DECL_LINK(allHandler, CheckBox&, void);
+    DECL_LINK(okHandler, Button*, void);
+    DECL_LINK(closeHandler, Button*, void);
+    DECL_LINK(hyperlink_clicked, FixedHyperlink&, void);
 
     css::uno::Reference< css::uno::XComponentContext >  m_context;
     VclPtr<FixedText> m_pchecking;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 79d55a2f6109..11a9b3919f8c 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -320,7 +320,7 @@ void UpdateInstallDialog::setError(OUString const & exceptionMessage)
     m_pMle_info->SetText(m_pMle_info->GetText() + exceptionMessage + "\n");
 }
 
-IMPL_LINK_NOARG_TYPED(UpdateInstallDialog, cancelHandler, Button*, void)
+IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler, Button*, void)
 {
     m_thread->stop();
     EndDialog();
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index bd30805ddffa..ebb3e1d51ba4 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -73,7 +73,7 @@ private:
     friend class Thread;
     friend class UpdateCommandEnv;
 
-    DECL_LINK_TYPED(cancelHandler, Button*, void);
+    DECL_LINK(cancelHandler, Button*, void);
 
     //signals in the dialog that we have finished.
     void updateDone();
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 6d4de1fe7805..e94db4bb5f6b 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -84,11 +84,11 @@ struct LicenseDialogImpl : public ModalDialog
     VclPtr<PushButton> m_pAcceptButton;
     VclPtr<PushButton> m_pDeclineButton;
 
-    DECL_LINK_TYPED(PageDownHdl, Button*, void);
-    DECL_LINK_TYPED(ScrolledHdl, LicenseView&, void);
-    DECL_LINK_TYPED(EndReachedHdl, LicenseView&, void);
-    DECL_LINK_TYPED(CancelHdl, Button*, void);
-    DECL_LINK_TYPED(AcceptHdl, Button*, void);
+    DECL_LINK(PageDownHdl, Button*, void);
+    DECL_LINK(ScrolledHdl, LicenseView&, void);
+    DECL_LINK(EndReachedHdl, LicenseView&, void);
+    DECL_LINK(CancelHdl, Button*, void);
+    DECL_LINK(AcceptHdl, Button*, void);
 
     bool m_bLicenseRead;
 
@@ -236,12 +236,12 @@ LicenseDialogImpl::LicenseDialogImpl(
     m_pDown->SetStyle( aStyle );
 }
 
-IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, AcceptHdl, Button*, void)
+IMPL_LINK_NOARG(LicenseDialogImpl, AcceptHdl, Button*, void)
 {
     EndDialog(RET_OK);
 }
 
-IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, CancelHdl, Button*, void)
+IMPL_LINK_NOARG(LicenseDialogImpl, CancelHdl, Button*, void)
 {
     EndDialog();
 }
@@ -266,7 +266,7 @@ void LicenseDialogImpl::Activate()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, ScrolledHdl, LicenseView&, void)
+IMPL_LINK_NOARG(LicenseDialogImpl, ScrolledHdl, LicenseView&, void)
 {
     if (m_pLicense->IsEndReached())
         m_pDown->Disable();
@@ -274,12 +274,12 @@ IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, ScrolledHdl, LicenseView&, void)
         m_pDown->Enable();
 }
 
-IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, PageDownHdl, Button*, void)
+IMPL_LINK_NOARG(LicenseDialogImpl, PageDownHdl, Button*, void)
 {
     m_pLicense->ScrollDown( ScrollType::PageDown );
 }
 
-IMPL_LINK_NOARG_TYPED(LicenseDialogImpl, EndReachedHdl, LicenseView&, void)
+IMPL_LINK_NOARG(LicenseDialogImpl, EndReachedHdl, LicenseView&, void)
 {
     m_pAcceptButton->Enable();
     m_pAcceptButton->GrabFocus();
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index c86db11363d4..a9b62cb6a0e7 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -72,7 +72,7 @@ private:
 
     VclPtr<SplashScreenWindow> pWindow;
 
-    DECL_LINK_TYPED( AppEventListenerHdl, VclSimpleEvent&, void );
+    DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void );
     virtual ~SplashScreen() override;
     void loadConfig();
     void updateStatus();
@@ -364,7 +364,7 @@ void SplashScreen::updateStatus()
 }
 
 // internal private methods
-IMPL_LINK_TYPED( SplashScreen, AppEventListenerHdl, VclSimpleEvent&, inEvent, void )
+IMPL_LINK( SplashScreen, AppEventListenerHdl, VclSimpleEvent&, inEvent, void )
 {
     if (static_cast<VclWindowEvent&>(inEvent).GetWindow() == pWindow)
     {