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

16 files changed, 91 insertions, 91 deletions

diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 269e666453b1..daa905069be2 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -221,7 +221,7 @@ void SvtFilePicker::prepareExecute()
 }
 
 
-IMPL_LINK_TYPED( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void )
+IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog&, rDlg, void )
 {
     if ( m_xDlgClosedListener.is() )
     {
diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx
index 1c9f19da76f0..8f940d272f97 100644
--- a/fpicker/source/office/OfficeFilePicker.hxx
+++ b/fpicker/source/office/OfficeFilePicker.hxx
@@ -222,7 +222,7 @@ protected:
 
     void                prepareExecute( );
 
-    DECL_LINK_TYPED(    DialogClosedHdl, Dialog&, void );
+    DECL_LINK(    DialogClosedHdl, Dialog&, void );
 };
 
 // SvtRemoteFilePicker
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index b22db30e8981..ad09f8dcf89c 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -96,7 +96,7 @@ void SvtFolderPicker::prepareExecute()
     }
 }
 
-IMPL_LINK_TYPED( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void )
+IMPL_LINK( SvtFolderPicker, DialogClosedHdl, Dialog&, rDlg, void )
 {
     if ( m_xListener.is() )
     {
diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx
index 31e7dbd27089..3b2c175401f5 100644
--- a/fpicker/source/office/OfficeFolderPicker.hxx
+++ b/fpicker/source/office/OfficeFolderPicker.hxx
@@ -46,7 +46,7 @@ private:
                             m_xListener;
 
     void                            prepareExecute( );
-    DECL_LINK_TYPED(                DialogClosedHdl, Dialog&, void );
+    DECL_LINK(                DialogClosedHdl, Dialog&, void );
 
 public:
                                     SvtFolderPicker();
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 64fe061eb76c..c146c5756c06 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -192,7 +192,7 @@ Image PlacesListBox::getEntryIcon( const PlacePtr& pPlace )
     return theImage;
 }
 
-IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void )
+IMPL_LINK_NOARG( PlacesListBox, Selection, SvTreeListBox*, void )
 {
     sal_uInt32 nSelected = mpImpl->GetCurrRow();
     PlacePtr pPlace = maPlaces[nSelected];
@@ -204,7 +204,7 @@ IMPL_LINK_NOARG_TYPED( PlacesListBox, Selection, SvTreeListBox*, void )
         mpDlg->RemovablePlaceSelected(false);
 }
 
-IMPL_LINK_NOARG_TYPED( PlacesListBox, DoubleClick, SvTreeListBox*, bool )
+IMPL_LINK_NOARG( PlacesListBox, DoubleClick, SvTreeListBox*, bool )
 {
     sal_uInt16 nSelected = mpImpl->GetCurrRow();
     PlacePtr pPlace = maPlaces[nSelected];
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index 5ea96efa3ce2..d4c10de5601e 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -76,8 +76,8 @@ class PlacesListBox : public Control
 
         Image getEntryIcon( const PlacePtr& pPlace );
 
-        DECL_LINK_TYPED( Selection, SvTreeListBox*, void );
-        DECL_LINK_TYPED( DoubleClick, SvTreeListBox*, bool );
+        DECL_LINK( Selection, SvTreeListBox*, void );
+        DECL_LINK( DoubleClick, SvTreeListBox*, bool );
 };
 
 #endif
diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx
index 31cbc6485c56..d3555e3fa9b3 100644
--- a/fpicker/source/office/QueryFolderName.hxx
+++ b/fpicker/source/office/QueryFolderName.hxx
@@ -32,8 +32,8 @@ private:
     VclPtr<VclFrame> m_pNameLine;
     VclPtr<OKButton> m_pOKBtn;
 
-    DECL_LINK_TYPED( OKHdl, Button*, void );
-    DECL_LINK_TYPED( NameHdl, Edit&, void );
+    DECL_LINK( OKHdl, Button*, void );
+    DECL_LINK( NameHdl, Edit&, void );
 
 public:
     QueryFolderNameDialog(vcl::Window* _pParent, const OUString& rTitle,
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index cc74021ade8f..49b576dcfa31 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -733,17 +733,17 @@ void RemoteFilesDialog::SavePassword( const OUString& rURL, const OUString& rUse
     {}
 }
 
-IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, IconViewHdl, Button*, void )
+IMPL_LINK_NOARG ( RemoteFilesDialog, IconViewHdl, Button*, void )
 {
     m_pFileView->SetViewMode( eIcon );
 }
 
-IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, ListViewHdl, Button*, void )
+IMPL_LINK_NOARG ( RemoteFilesDialog, ListViewHdl, Button*, void )
 {
     m_pFileView->SetViewMode( eDetailedList );
 }
 
-IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void )
+IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl, Button*, void )
 {
     ScopedVclPtrInstance< PlaceEditDialog > aDlg( this );
     aDlg->ShowPasswordControl();
@@ -786,7 +786,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, AddServiceHdl, Button*, void )
     };
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectServiceHdl, ListBox&, void )
+IMPL_LINK_NOARG( RemoteFilesDialog, SelectServiceHdl, ListBox&, void )
 {
     int nPos = GetSelectedServicePos();
 
@@ -800,7 +800,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectServiceHdl, ListBox&, void )
     }
 }
 
-IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void )
+IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void )
 {
     OString sIdent( pButton->GetCurItemIdent() );
     if( sIdent == "edit_service"  && m_pServices_lb->GetEntryCount() > 0 )
@@ -940,7 +940,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton,
     EnableControls();
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool )
+IMPL_LINK_NOARG( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool )
 {
     if( m_pFileView->GetSelectionCount() )
     {
@@ -967,7 +967,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, DoubleClickHdl, SvTreeListBox*, bool )
     return true;
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void )
+IMPL_LINK_NOARG( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void )
 {
     SvTreeListEntry* pEntry = m_pFileView->FirstSelected();
 
@@ -1004,19 +1004,19 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectHdl, SvTreeListBox*, void )
     }
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, FileNameGetFocusHdl, Control&, void )
+IMPL_LINK_NOARG( RemoteFilesDialog, FileNameGetFocusHdl, Control&, void )
 {
     m_pFileView->SetNoSelection();
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, FileNameModifyHdl, Edit&, void )
+IMPL_LINK_NOARG( RemoteFilesDialog, FileNameModifyHdl, Edit&, void )
 {
     m_pFileView->SetNoSelection();
     if( !m_pOk_btn->IsEnabled() )
         EnableControls();
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SplitHdl, Splitter*, void )
+IMPL_LINK_NOARG( RemoteFilesDialog, SplitHdl, Splitter*, void )
 {
     sal_Int32 nSplitPos = m_pSplitter->GetSplitPosPixel();
 
@@ -1038,7 +1038,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SplitHdl, Splitter*, void )
     m_pSplitter->SetPosPixel( Point( placeSize.Width(), m_pSplitter->GetPosPixel().Y() ) );
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectFilterHdl, ListBox&, void )
+IMPL_LINK_NOARG( RemoteFilesDialog, SelectFilterHdl, ListBox&, void )
 {
     unsigned int nPos = m_pFilter_lb->GetSelectEntryPos();
 
@@ -1053,7 +1053,7 @@ IMPL_LINK_NOARG_TYPED( RemoteFilesDialog, SelectFilterHdl, ListBox&, void )
     }
 }
 
-IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void )
+IMPL_LINK( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void )
 {
     OUString* sURL = static_cast< OUString* >( pBox->GetHdlEntry()->GetUserData() );
 
@@ -1064,12 +1064,12 @@ IMPL_LINK_TYPED( RemoteFilesDialog, TreeSelectHdl, SvTreeListBox *, pBox, void )
     }
 }
 
-IMPL_LINK_TYPED ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void )
+IMPL_LINK ( RemoteFilesDialog, SelectBreadcrumbHdl, Breadcrumb*, pPtr, void )
 {
     OpenURL( pPtr->GetHdlURL() );
 }
 
-IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, NewFolderHdl, Button*, void )
+IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl, Button*, void )
 {
     m_pFileView->EndInplaceEditing();
 
@@ -1102,7 +1102,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, NewFolderHdl, Button*, void )
     }
 }
 
-IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void )
+IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl, Button*, void )
 {
     OUString sNameNoExt = m_pName_ed->GetText();
     OUString sPathNoExt;
@@ -1182,7 +1182,7 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void )
     EndDialog( RET_OK );
 }
 
-IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, CancelHdl, Button*, void )
+IMPL_LINK_NOARG ( RemoteFilesDialog, CancelHdl, Button*, void )
 {
     if( m_pCurrentAsyncAction.is() )
     {
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 672e2fa3ff33..995a7b715c0d 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -186,30 +186,30 @@ private:
     void SavePassword( const OUString& rURL, const OUString& rUser
                     , const OUString& rPassword, bool bPersistent );
 
-    DECL_LINK_TYPED ( AddServiceHdl, Button*, void );
-    DECL_LINK_TYPED ( SelectServiceHdl, ListBox&, void );
-    DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void );
+    DECL_LINK ( AddServiceHdl, Button*, void );
+    DECL_LINK ( SelectServiceHdl, ListBox&, void );
+    DECL_LINK ( EditServiceMenuHdl, MenuButton *, void );
 
-    DECL_LINK_TYPED( DoubleClickHdl, SvTreeListBox*, bool );
-    DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void );
+    DECL_LINK( DoubleClickHdl, SvTreeListBox*, bool );
+    DECL_LINK( SelectHdl, SvTreeListBox*, void );
 
-    DECL_LINK_TYPED( FileNameGetFocusHdl, Control&, void );
-    DECL_LINK_TYPED( FileNameModifyHdl, Edit&, void );
+    DECL_LINK( FileNameGetFocusHdl, Control&, void );
+    DECL_LINK( FileNameModifyHdl, Edit&, void );
 
-    DECL_LINK_TYPED( SplitHdl, Splitter*, void );
+    DECL_LINK( SplitHdl, Splitter*, void );
 
-    DECL_LINK_TYPED( SelectFilterHdl, ListBox&, void );
+    DECL_LINK( SelectFilterHdl, ListBox&, void );
 
-    DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void );
+    DECL_LINK( TreeSelectHdl, SvTreeListBox*, void );
 
-    DECL_LINK_TYPED( SelectBreadcrumbHdl, Breadcrumb *, void );
+    DECL_LINK( SelectBreadcrumbHdl, Breadcrumb *, void );
 
-    DECL_LINK_TYPED( NewFolderHdl, Button*, void );
-    DECL_LINK_TYPED( IconViewHdl, Button*, void );
-    DECL_LINK_TYPED( ListViewHdl, Button*, void );
+    DECL_LINK( NewFolderHdl, Button*, void );
+    DECL_LINK( IconViewHdl, Button*, void );
+    DECL_LINK( ListViewHdl, Button*, void );
 
-    DECL_LINK_TYPED( OkHdl, Button*, void );
-    DECL_LINK_TYPED( CancelHdl, Button*, void );
+    DECL_LINK( OkHdl, Button*, void );
+    DECL_LINK( CancelHdl, Button*, void );
 };
 
 #endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 2f390e621797..6f86b4161a86 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -125,7 +125,7 @@ namespace svt
     }
 
 
-    IMPL_LINK_TYPED( AsyncPickerAction, OnActionDone, void*, pEmptyArg, void )
+    IMPL_LINK( AsyncPickerAction, OnActionDone, void*, pEmptyArg, void )
     {
         DBG_TESTSOLARMUTEX();
             // if this asserts, we'd need to have an own mutex per instance
diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx
index 51089d35b349..ff287f56ba4c 100644
--- a/fpicker/source/office/asyncfilepicker.hxx
+++ b/fpicker/source/office/asyncfilepicker.hxx
@@ -83,7 +83,7 @@ namespace svt
         virtual ~AsyncPickerAction() override;
 
     private:
-        DECL_LINK_TYPED( OnActionDone, void*, void );
+        DECL_LINK( OnActionDone, void*, void );
 
         AsyncPickerAction( const AsyncPickerAction& ) = delete;
         AsyncPickerAction& operator=( const AsyncPickerAction& ) = delete;
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 0869654afe23..f498a79c0d0a 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -387,7 +387,7 @@ namespace svt
     }
 
 
-    IMPL_LINK_NOARG_TYPED(OCommonPicker, OnCancelPicker, void*, void)
+    IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker, void*, void)
     {
         // By definition, the solar mutex is locked when we arrive here. Note that this
         // is important, as for instance the consistency of m_pDlg depends on this mutex.
diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx
index 5039254d7515..90d86a9c4a3a 100644
--- a/fpicker/source/office/commonpicker.hxx
+++ b/fpicker/source/office/commonpicker.hxx
@@ -184,7 +184,7 @@ namespace svt
     private:
         void        stopWindowListening();
 
-        DECL_LINK_TYPED( OnCancelPicker, void*, void );
+        DECL_LINK( OnCancelPicker, void*, void );
     };
 
 }   // namespace svt
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 6a8b5a26a8b4..9eab3c15cd6f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -735,7 +735,7 @@ void SvtFileDialog::Init_Impl
     Resize();
 }
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, NewFolderHdl_Impl, Button*, void)
+IMPL_LINK_NOARG( SvtFileDialog, NewFolderHdl_Impl, Button*, void)
 {
     _pFileView->EndInplaceEditing();
 
@@ -830,7 +830,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter )
 }
 
 
-IMPL_LINK_NOARG_TYPED(SvtFileDialog, CancelHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl, Button*, void)
 {
     if ( m_pCurrentAsyncAction.is() )
     {
@@ -844,11 +844,11 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, CancelHdl_Impl, Button*, void)
 }
 
 
-IMPL_LINK_TYPED( SvtFileDialog, OpenClickHdl_Impl, Button*, pVoid, void )
+IMPL_LINK( SvtFileDialog, OpenClickHdl_Impl, Button*, pVoid, void )
 {
     OpenHdl_Impl(pVoid);
 }
-IMPL_LINK_TYPED( SvtFileDialog, OpenUrlHdl_Impl, SvtURLBox*, pVoid, void )
+IMPL_LINK( SvtFileDialog, OpenUrlHdl_Impl, SvtURLBox*, pVoid, void )
 {
     OpenHdl_Impl(pVoid);
 }
@@ -1153,7 +1153,7 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable )
 }
 
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void )
+IMPL_LINK_NOARG( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void )
 {
     OUString sSelectedFilterDisplayName;
     SvtFileDialogFilter_Impl* pSelectedFilter = _pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName );
@@ -1225,33 +1225,33 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, FilterSelectHdl_Impl, ListBox&, void )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void)
+IMPL_LINK_NOARG(SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void)
 {
     // filter the view again
     ExecuteFilter();
 }
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void )
+IMPL_LINK_NOARG( SvtFileDialog, FileNameGetFocusHdl_Impl, Control&, void )
 {
     _pFileView->SetNoSelection();
     _pFileView->Update();
 }
 
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, FileNameModifiedHdl_Impl, Edit&, void )
+IMPL_LINK_NOARG( SvtFileDialog, FileNameModifiedHdl_Impl, Edit&, void )
 {
     FileNameGetFocusHdl_Impl( *_pImp->_pEdFileName );
 }
 
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void )
+IMPL_LINK_NOARG( SvtFileDialog, URLBoxModifiedHdl_Impl, SvtURLBox*, void )
 {
     OUString aPath = _pImp->_pEdCurrentPath->GetURL();
     OpenURL_Impl(aPath);
 }
 
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void )
+IMPL_LINK_NOARG( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void )
 {
     _pFileView->EndInplaceEditing();
 
@@ -1274,7 +1274,7 @@ IMPL_LINK_NOARG_TYPED( SvtFileDialog, ConnectToServerPressed_Hdl, Button*, void
 }
 
 
-IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void )
+IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void )
 {
     // Maybe open the PlacesDialog would have been a better idea
     // there is an ux choice to make we did not make...
@@ -1286,7 +1286,7 @@ IMPL_LINK_NOARG_TYPED ( SvtFileDialog, AddPlacePressed_Hdl, Button*, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void )
+IMPL_LINK_NOARG ( SvtFileDialog, RemovePlacePressed_Hdl, Button*, void )
 {
     _pImp->_pPlaces->RemoveSelectedPlace();
 }
@@ -1429,7 +1429,7 @@ void SvtFileDialog::UpdateControls( const OUString& rURL )
 }
 
 
-IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void )
+IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void )
 {
     SvTreeListEntry* pEntry = pBox->FirstSelected();
     assert( pEntry && "SelectHandler without selected entry" );
@@ -1480,7 +1480,7 @@ IMPL_LINK_TYPED( SvtFileDialog, SelectHdl_Impl, SvTreeListBox*, pBox, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool)
+IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool)
 {
     _pImp->_bDoubleClick = true;
     OpenHdl_Impl( nullptr );
@@ -1490,13 +1490,13 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, DblClickHdl_Impl, SvTreeListBox*, bool)
 }
 
 
-IMPL_LINK_NOARG_TYPED(SvtFileDialog, EntrySelectHdl_Impl, ComboBox&, void)
+IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl, ComboBox&, void)
 {
     FileSelect();
 }
 
 
-IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void )
+IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void )
 {
     OUString sCurrentFolder( pView->GetViewURL() );
     // check if we can create new folders
@@ -1517,7 +1517,7 @@ IMPL_LINK_TYPED( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void)
 {
     if ( _pFileNotifier )
         _pFileNotifier->notify( CTRL_STATE_CHANGED,
@@ -1528,7 +1528,7 @@ IMPL_LINK_NOARG_TYPED(SvtFileDialog, AutoExtensionHdl_Impl, Button*, void)
 }
 
 
-IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void )
+IMPL_LINK( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void )
 {
     if ( ! _pFileNotifier )
         return;
@@ -1553,7 +1553,7 @@ IMPL_LINK_TYPED( SvtFileDialog, ClickHdl_Impl, Button*, pCheckBox, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED(SvtFileDialog, PlayButtonHdl_Impl, Button*, void)
+IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl, Button*, void)
 {
     if ( _pFileNotifier )
         _pFileNotifier->notify( CTRL_STATE_CHANGED,
@@ -2726,7 +2726,7 @@ void SvtFileDialog::initDefaultPlaces( )
     _pImp->_pPlaces->IsUpdated();
 }
 
-IMPL_LINK_NOARG_TYPED( SvtFileDialog, Split_Hdl, Splitter*, void )
+IMPL_LINK_NOARG( SvtFileDialog, Split_Hdl, Splitter*, void )
 {
     sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel();
 
@@ -2776,7 +2776,7 @@ void QueryFolderNameDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, OKHdl, Button*, void)
+IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl, Button*, void)
 {
     // trim the strings
     m_pNameEdit->SetText(comphelper::string::strip(m_pNameEdit->GetText(), ' '));
@@ -2784,7 +2784,7 @@ IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, OKHdl, Button*, void)
 }
 
 
-IMPL_LINK_NOARG_TYPED(QueryFolderNameDialog, NameHdl, Edit&, void)
+IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl, Edit&, void)
 {
     // trim the strings
     OUString aName = comphelper::string::strip(m_pNameEdit->GetText(), ' ');
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index a097aeaf1c88..f841ee44b73b 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -83,21 +83,21 @@ private:
     css::uno::Reference < css::uno::XComponentContext >
                                 m_context;
 
-    DECL_LINK_TYPED(            FilterSelectHdl_Impl, ListBox&, void );
-    DECL_LINK_TYPED(            FilterSelectTimerHdl_Impl, Timer*, void );
-    DECL_LINK_TYPED(            NewFolderHdl_Impl, Button*, void );
-    DECL_LINK_TYPED(            OpenUrlHdl_Impl, SvtURLBox*, void );
-    DECL_LINK_TYPED(            OpenClickHdl_Impl, Button*, void );
-    DECL_LINK_TYPED(            CancelHdl_Impl, Button*, void );
-    DECL_LINK_TYPED(            FileNameGetFocusHdl_Impl, Control&, void );
-    DECL_LINK_TYPED(            FileNameModifiedHdl_Impl, Edit&, void );
-
-    DECL_LINK_TYPED(            URLBoxModifiedHdl_Impl, SvtURLBox*, void );
-    DECL_LINK_TYPED(            ConnectToServerPressed_Hdl, Button*, void );
-
-    DECL_LINK_TYPED(            AddPlacePressed_Hdl, Button*, void );
-    DECL_LINK_TYPED(            RemovePlacePressed_Hdl, Button*, void );
-    DECL_LINK_TYPED(            Split_Hdl, Splitter*, void );
+    DECL_LINK(            FilterSelectHdl_Impl, ListBox&, void );
+    DECL_LINK(            FilterSelectTimerHdl_Impl, Timer*, void );
+    DECL_LINK(            NewFolderHdl_Impl, Button*, void );
+    DECL_LINK(            OpenUrlHdl_Impl, SvtURLBox*, void );
+    DECL_LINK(            OpenClickHdl_Impl, Button*, void );
+    DECL_LINK(            CancelHdl_Impl, Button*, void );
+    DECL_LINK(            FileNameGetFocusHdl_Impl, Control&, void );
+    DECL_LINK(            FileNameModifiedHdl_Impl, Edit&, void );
+
+    DECL_LINK(            URLBoxModifiedHdl_Impl, SvtURLBox*, void );
+    DECL_LINK(            ConnectToServerPressed_Hdl, Button*, void );
+
+    DECL_LINK(            AddPlacePressed_Hdl, Button*, void );
+    DECL_LINK(            RemovePlacePressed_Hdl, Button*, void );
+    DECL_LINK(            Split_Hdl, Splitter*, void );
 
     void                        OpenHdl_Impl(void* pVoid);
     void                        Init_Impl( PickerFlags nBits );
@@ -119,13 +119,13 @@ private:
     void                        OpenMultiSelection_Impl();
     void                        AddControls_Impl( );
 
-    DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void );
-    DECL_LINK_TYPED( DblClickHdl_Impl, SvTreeListBox*, bool);
-    DECL_LINK_TYPED( EntrySelectHdl_Impl, ComboBox&, void);
-    DECL_LINK_TYPED( OpenDoneHdl_Impl, SvtFileView*, void );
-    DECL_LINK_TYPED( AutoExtensionHdl_Impl, Button*, void);
-    DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
-    DECL_LINK_TYPED( PlayButtonHdl_Impl, Button*, void);
+    DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void );
+    DECL_LINK( DblClickHdl_Impl, SvTreeListBox*, bool);
+    DECL_LINK( EntrySelectHdl_Impl, ComboBox&, void);
+    DECL_LINK( OpenDoneHdl_Impl, SvtFileView*, void );
+    DECL_LINK( AutoExtensionHdl_Impl, Button*, void);
+    DECL_LINK( ClickHdl_Impl, Button*, void );
+    DECL_LINK( PlayButtonHdl_Impl, Button*, void);
 
 
     // removes a filter with wildcards from the path and returns it
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 5bfa801a5546..c5c16066c403 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -162,7 +162,7 @@ void MyWin::Resize()
 }
 
 
-IMPL_LINK_TYPED( MyWin, Test, PushButton*, pBtn, void )
+IMPL_LINK( MyWin, Test, PushButton*, pBtn, void )
 {
 printf("Test\n");
     if ( pBtn == &aOKBtn )