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

161 files changed, 506 insertions, 506 deletions

diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 91c08dca1edf..bc6adda756a6 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -410,7 +410,7 @@ protected:
     void lockRebuilds();
     void unlockRebuilds();
 
-    DECL_LINK_TYPED(onTimerHdl, Timer *, void);
+    DECL_LINK(onTimerHdl, Timer *, void);
 
     virtual void implRebuild() override;
 
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index d23977dbb794..cc88e286562e 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -184,9 +184,9 @@ private:
     SAL_DLLPRIVATE void                FillOnlineSpellingList(SdPage* pPage);
     SAL_DLLPRIVATE void                SpellObject(SdrTextObj* pObj);
 
-                        DECL_DLLPRIVATE_LINK_TYPED(WorkStartupHdl, Timer *, void);
-                        DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellingHdl, Idle *, void);
-                        DECL_DLLPRIVATE_LINK_TYPED(OnlineSpellEventHdl, EditStatus&, void);
+                        DECL_DLLPRIVATE_LINK(WorkStartupHdl, Timer *, void);
+                        DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, Idle *, void);
+                        DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus&, void);
 
     std::vector< OUString > maAnnotationAuthors;
     std::vector<css::uno::Reference< css::xml::dom::XNode> > maLayoutInfo;
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 74023c512ea4..ed4435d47dca 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -78,7 +78,7 @@ class SdModule : public SfxModule, public SfxListener
 {
 public:
                             SFX_DECL_INTERFACE(SD_IF_SDAPP)
-                            DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void );
+                            DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void );
 
 private:
     /// SfxInterface initializer.
@@ -174,7 +174,7 @@ private:
         @VclSimpleEvent *
             a pointer to a VCLSimpleEvent (see vcl/vclevent.hxx )
     */
-    DECL_STATIC_LINK_TYPED( SdModule, EventListenerHdl, VclSimpleEvent&, void );
+    DECL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, void );
 
 };
 
diff --git a/sd/inc/sdobjfac.hxx b/sd/inc/sdobjfac.hxx
index de130a2c4c2a..56c96baf3442 100644
--- a/sd/inc/sdobjfac.hxx
+++ b/sd/inc/sdobjfac.hxx
@@ -29,7 +29,7 @@ class SdObjectFactory
 public:
     SdObjectFactory() {}
 
-    DECL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* );
+    DECL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* );
 };
 
 extern SdObjectFactory aSdObjectFactory;
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index b7e9bead245e..804bda8569e1 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -3408,7 +3408,7 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const cs
 
 }
 
-IMPL_LINK_NOARG_TYPED(MainSequence, onTimerHdl, Timer *, void)
+IMPL_LINK_NOARG(MainSequence, onTimerHdl, Timer *, void)
 {
     if( mbTimerMode )
     {
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 9e3672570e21..601b4bb90939 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -882,7 +882,7 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const
 }
 
 // Initiate WorkStartup
-IMPL_LINK_NOARG_TYPED(SdDrawDocument, WorkStartupHdl, Timer *, void)
+IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl, Timer *, void)
 {
     if (IsTransportContainer())
         return;
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index d92c0c7989fd..c9b7ef855439 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -821,7 +821,7 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
 }
 
 // OnlineSpelling in the background
-IMPL_LINK_NOARG_TYPED(SdDrawDocument, OnlineSpellingHdl, Idle *, void)
+IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl, Idle *, void)
 {
     if (mpOnlineSpellingList!=nullptr
         && ( !mbOnlineSpell || mpOnlineSpellingList->hasMore()))
@@ -953,7 +953,7 @@ void SdDrawDocument::RemoveObject(SdrObject* pObj, SdPage* /*pPage*/)
 }
 
 // Callback for ExecuteSpellPopup()
-IMPL_LINK_TYPED(SdDrawDocument, OnlineSpellEventHdl, EditStatus&, rEditStat, void)
+IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus&, rEditStat, void)
 {
     EditStatusFlags nStat = rEditStat.GetStatusWord();
     mbHasOnlineSpellErrors = bool(nStat & EditStatusFlags::WRONGWORDCHANGED);
diff --git a/sd/source/core/sdobjfac.cxx b/sd/source/core/sdobjfac.cxx
index 193a15bfb09d..a3fc3dc06f29 100644
--- a/sd/source/core/sdobjfac.cxx
+++ b/sd/source/core/sdobjfac.cxx
@@ -35,7 +35,7 @@ SdObjectFactory aSdObjectFactory;
 |*
 \************************************************************************/
 
-IMPL_STATIC_LINK_TYPED( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* )
+IMPL_STATIC_LINK( SdObjectFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* )
 {
     if ( aParams.nInventor == SdUDInventor )
     {
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 1f9ffad68546..cb7dbd6d5e93 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -347,7 +347,7 @@ public:
     virtual ~SdDesignNameDlg() override;
     virtual void dispose() override;
     OUString GetDesignName();
-    DECL_LINK_TYPED(ModifyHdl, Edit&, void);
+    DECL_LINK(ModifyHdl, Edit&, void);
 };
 
 // SdPublishingDlg Methods
@@ -931,7 +931,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
 }
 
 // Clickhandler for the radiobuttons of the design-selection
-IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 {
     if(pButton == pPage1_NewDesign)
     {
@@ -963,7 +963,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, DesignHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the choice of one design
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 {
     const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
     m_pDesign = &m_aDesignList[nPos];
@@ -976,7 +976,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignSelectHdl, ListBox&, void)
 }
 
 // Clickhandler for the delete of one design
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl, Button*, void)
 {
     const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos();
 
@@ -997,7 +997,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, DesignDeleteHdl, Button*, void)
 }
 
 // Clickhandler for the other servertypess
-IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
 {
     bool bASP = pButton == pPage2_ASP;
 
@@ -1007,7 +1007,7 @@ IMPL_LINK_TYPED( SdPublishingDlg, WebServerHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the Radiobuttons of the graphicformat choice
-IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
 {
     pPage3_Png->Check( pButton == pPage3_Png );
     pPage3_Gif->Check( pButton == pPage3_Gif );
@@ -1016,13 +1016,13 @@ IMPL_LINK_TYPED( SdPublishingDlg, GfxFormatHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the Radiobuttons Standard/Frames
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, BaseHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, BaseHdl, Button*, void)
 {
     UpdatePage();
 }
 
 // Clickhandler for the Checkbox of the Title page
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, Button*, void)
 {
     if(pPage2_Content->IsChecked())
     {
@@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ContentHdl, Button*, void)
 }
 
 // Clickhandler for the Resolution Radiobuttons
-IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
+IMPL_LINK( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
 {
     pPage3_Resolution_1->Check(pButton == pPage3_Resolution_1);
     pPage3_Resolution_2->Check(pButton == pPage3_Resolution_2);
@@ -1051,14 +1051,14 @@ IMPL_LINK_TYPED( SdPublishingDlg, ResolutionHdl, Button *, pButton, void )
 }
 
 // Clickhandler for the ValueSet with the bitmap-buttons
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, ButtonsHdl, ValueSet*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, ButtonsHdl, ValueSet*, void)
 {
     // if one bitmap-button is chosen, then disable TextOnly
     pPage5_TextOnly->Check(false);
 }
 
 // Fill the SfxItemSet with the settings of the dialog
-IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void)
+IMPL_LINK( SdPublishingDlg, ColorHdl, Button *, pButton, void)
 {
     SvColorDialog aDlg(this);
 
@@ -1099,13 +1099,13 @@ IMPL_LINK_TYPED( SdPublishingDlg, ColorHdl, Button *, pButton, void)
     pPage6_Preview->Invalidate();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, SlideChgHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, SlideChgHdl, Button*, void)
 {
     UpdatePage();
 }
 
 // Clickhandler for the Ok Button
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, FinishHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl, Button*, void)
 {
     //End
     SdPublishingDesign aDesign;
@@ -1352,7 +1352,7 @@ void SdPublishingDlg::LoadPreviewButtons()
 }
 
 // Clickhandler for the Forward Button
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, NextPageHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, NextPageHdl, Button*, void)
 {
     aAssistentFunc.NextPage();
     ChangePage();
@@ -1497,7 +1497,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
 }
 
 // Clickhandler for the back Button
-IMPL_LINK_NOARG_TYPED(SdPublishingDlg, LastPageHdl, Button*, void)
+IMPL_LINK_NOARG(SdPublishingDlg, LastPageHdl, Button*, void)
 {
     aAssistentFunc.PreviousPage();
     ChangePage();
@@ -1641,7 +1641,7 @@ OUString SdDesignNameDlg::GetDesignName()
     return m_pEdit->GetText();
 }
 
-IMPL_LINK_NOARG_TYPED(SdDesignNameDlg, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SdDesignNameDlg, ModifyHdl, Edit&, void)
 {
     m_pBtnOK->Enable(!m_pEdit->GetText().isEmpty());
 }
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 2dbceddf663d..bff0e125a8e4 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -159,7 +159,7 @@ void AccessibleDocumentViewBase::Init()
         SetState(AccessibleStateType::EDITABLE);
 }
 
-IMPL_LINK_TYPED(AccessibleDocumentViewBase, WindowChildEventListener,
+IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener,
     VclWindowEvent&, rEvent, void)
 {
         //      DBG_ASSERT( pVclEvent->GetWindow(), "Window???" );
diff --git a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
index d4c517726379..d7f0dc03ab3c 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx
@@ -202,7 +202,7 @@ namespace accessibility
         }
     }
 
-    IMPL_LINK_TYPED(AccessibleOutlineEditSource, NotifyHdl, EENotify&, rNotify, void)
+    IMPL_LINK(AccessibleOutlineEditSource, NotifyHdl, EENotify&, rNotify, void)
     {
         ::std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify) );
 
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 08c0ec8538de..6e64e3f2d664 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -80,12 +80,12 @@ public:
     void ConnectListeners();
     void ReleaseListeners();
     void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override;
-    DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void);
-    DECL_LINK_TYPED(SelectionChangeListener, LinkParamNone*, void);
-    DECL_LINK_TYPED(BroadcastSelectionChange, void*, void);
-    DECL_LINK_TYPED(FocusChangeListener, LinkParamNone*, void);
-    DECL_LINK_TYPED(VisibilityChangeListener, LinkParamNone*, void);
-    DECL_LINK_TYPED(UpdateChildrenCallback, void*, void);
+    DECL_LINK(WindowEventListener, VclWindowEvent&, void);
+    DECL_LINK(SelectionChangeListener, LinkParamNone*, void);
+    DECL_LINK(BroadcastSelectionChange, void*, void);
+    DECL_LINK(FocusChangeListener, LinkParamNone*, void);
+    DECL_LINK(VisibilityChangeListener, LinkParamNone*, void);
+    DECL_LINK(UpdateChildrenCallback, void*, void);
 
     void Activated();
 private:
@@ -895,7 +895,7 @@ void AccessibleSlideSorterView::Implementation::Activated()
 
 }
 
-IMPL_LINK_TYPED(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWindowEvent&, rEvent, void)
+IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWindowEvent&, rEvent, void)
 {
     switch (rEvent.GetId())
     {
@@ -916,14 +916,14 @@ IMPL_LINK_TYPED(AccessibleSlideSorterView::Implementation, WindowEventListener,
     }
 }
 
-IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, SelectionChangeListener, LinkParamNone*, void)
+IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, SelectionChangeListener, LinkParamNone*, void)
 {
     if (mnSelectionChangeUserEventId == nullptr)
         mnSelectionChangeUserEventId = Application::PostUserEvent(
             LINK(this, AccessibleSlideSorterView::Implementation, BroadcastSelectionChange));
 }
 
-IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void)
+IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, BroadcastSelectionChange, void*, void)
 {
     mnSelectionChangeUserEventId = nullptr;
     mrAccessibleSlideSorter.FireAccessibleEvent(
@@ -932,7 +932,7 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, BroadcastSelect
         Any());
 }
 
-IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeListener, LinkParamNone*, void)
+IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, FocusChangeListener, LinkParamNone*, void)
 {
     sal_Int32 nNewFocusedIndex (
         mrSlideSorter.GetController().GetFocusManager().GetFocusedPageIndex());
@@ -974,13 +974,13 @@ IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, FocusChangeList
     }
 }
 
-IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void)
+IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, void*, void)
 {
     mnUpdateChildrenUserEventId = nullptr;
     UpdateChildren();
 }
 
-IMPL_LINK_NOARG_TYPED(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, LinkParamNone*, void)
+IMPL_LINK_NOARG(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, LinkParamNone*, void)
 {
     UpdateChildren();
 }
diff --git a/sd/source/ui/animations/CategoryListBox.cxx b/sd/source/ui/animations/CategoryListBox.cxx
index 4f66a379b963..ff1b28c5b7ba 100644
--- a/sd/source/ui/animations/CategoryListBox.cxx
+++ b/sd/source/ui/animations/CategoryListBox.cxx
@@ -73,7 +73,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(CategoryListBox, implDoubleClickHdl, ListBox&, void)
+IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl, ListBox&, void)
 {
     CaptureMouse();
 }
diff --git a/sd/source/ui/animations/CategoryListBox.hxx b/sd/source/ui/animations/CategoryListBox.hxx
index 25edc35e4b8a..37f6d3883f7b 100644
--- a/sd/source/ui/animations/CategoryListBox.hxx
+++ b/sd/source/ui/animations/CategoryListBox.hxx
@@ -35,7 +35,7 @@ public:
 
     void                InsertCategory( const OUString& rStr );
 
-    DECL_LINK_TYPED(implDoubleClickHdl, ListBox&, void);
+    DECL_LINK(implDoubleClickHdl, ListBox&, void);
 
 private:
     virtual void    UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index d912f6d5ec05..31d98f2d191b 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -110,7 +110,7 @@ public:
 private:
     std::map< sal_uInt16, OUString > maPropertyValues;
     VclPtr<ListBox> mpControl;
-    DECL_LINK_TYPED(OnSelect, ListBox&, void);
+    DECL_LINK(OnSelect, ListBox&, void);
     Link<LinkParamNone*,void> maModifyLink;
 };
 
@@ -125,7 +125,7 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pPare
     setValue( rValue, aPresetId );
 }
 
-IMPL_LINK_NOARG_TYPED(PresetPropertyBox, OnSelect, ListBox&, void)
+IMPL_LINK_NOARG(PresetPropertyBox, OnSelect, ListBox&, void)
 {
     maModifyLink.Call(nullptr);
 }
@@ -192,7 +192,7 @@ public:
 
 private:
     VclPtr<ColorListBox> mpControl;
-    DECL_LINK_TYPED(OnSelect, ListBox&, void);
+    DECL_LINK(OnSelect, ListBox&, void);
     Link<LinkParamNone*,void> maModifyLink;
 };
 
@@ -227,7 +227,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ColorPropertyBox, OnSelect, ListBox&, void)
+IMPL_LINK_NOARG(ColorPropertyBox, OnSelect, ListBox&, void)
 {
     maModifyLink.Call(nullptr);
 }
@@ -273,7 +273,7 @@ public:
 private:
     VclPtr<FontNameBox>         mpControl;
     Link<LinkParamNone*,void>   maModifyHdl;
-    DECL_LINK_TYPED(ControlSelectHdl, ComboBox&, void);
+    DECL_LINK(ControlSelectHdl, ComboBox&, void);
 };
 
 FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent, const Any& rValue, const Link<LinkParamNone*,void>& rModifyHdl )
@@ -308,7 +308,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent,
     setValue( rValue, aPresetId );
 }
 
-IMPL_LINK_NOARG_TYPED(FontPropertyBox, ControlSelectHdl, ComboBox&, void)
+IMPL_LINK_NOARG(FontPropertyBox, ControlSelectHdl, ComboBox&, void)
 {
     maModifyHdl.Call(nullptr);
 }
@@ -431,10 +431,10 @@ public:
 
     virtual Control* getControl() override;
 
-    DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void );
+    DECL_LINK( implMenuSelectHdl, MenuButton*, void );
 
 private:
-    DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
+    DECL_LINK( EditModifyHdl, Edit&, void );
     VclPtr<DropdownMenuBox> mpControl;
     VclPtr<PopupMenu> mpMenu;
     VclPtr<MetricField> mpMetric;
@@ -464,12 +464,12 @@ CharHeightPropertyBox::~CharHeightPropertyBox()
     mpControl.disposeAndClear();
 }
 
-IMPL_LINK_NOARG_TYPED( CharHeightPropertyBox, EditModifyHdl, Edit&, void )
+IMPL_LINK_NOARG( CharHeightPropertyBox, EditModifyHdl, Edit&, void )
 {
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK_TYPED( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
+IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
 {
     long nValue = 100;
     switch( pPb->GetCurItemId() )
@@ -514,8 +514,8 @@ public:
 
     virtual Control* getControl() override;
 
-    DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void );
-    DECL_LINK_TYPED( implModifyHdl, Edit&, void );
+    DECL_LINK( implMenuSelectHdl, MenuButton*, void );
+    DECL_LINK( implModifyHdl, Edit&, void );
 
     void updateMenu();
 
@@ -566,13 +566,13 @@ void TransparencyPropertyBox::updateMenu()
         mpMenu->CheckItem( i, nValue == i );
 }
 
-IMPL_LINK_NOARG_TYPED(TransparencyPropertyBox, implModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl, Edit&, void)
 {
     updateMenu();
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK_TYPED( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
+IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
 {
     if( pPb->GetCurItemId() != mpMetric->GetValue() )
     {
@@ -614,8 +614,8 @@ public:
 
     virtual Control* getControl() override;
 
-    DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void );
-    DECL_LINK_TYPED( implModifyHdl, Edit&, void );
+    DECL_LINK( implMenuSelectHdl, MenuButton*, void );
+    DECL_LINK( implModifyHdl, Edit&, void );
 
     void updateMenu();
 
@@ -668,13 +668,13 @@ void RotationPropertyBox::updateMenu()
     mpMenu->CheckItem( CM_COUNTERCLOCKWISE, !bDirection );
 }
 
-IMPL_LINK_NOARG_TYPED(RotationPropertyBox, implModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(RotationPropertyBox, implModifyHdl, Edit&, void)
 {
     updateMenu();
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK_TYPED( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
+IMPL_LINK( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
 {
     sal_Int64 nValue = mpMetric->GetValue();
     bool bDirection = nValue >= 0;
@@ -735,8 +735,8 @@ public:
 
     virtual Control* getControl() override;
 
-    DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void );
-    DECL_LINK_TYPED( implModifyHdl, Edit&, void );
+    DECL_LINK( implMenuSelectHdl, MenuButton*, void );
+    DECL_LINK( implModifyHdl, Edit&, void );
 
     void updateMenu();
 
@@ -788,13 +788,13 @@ void ScalePropertyBox::updateMenu()
     mpMenu->CheckItem( CM_BOTH, mnDirection == 3 );
 }
 
-IMPL_LINK_NOARG_TYPED(ScalePropertyBox, implModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(ScalePropertyBox, implModifyHdl, Edit&, void)
 {
     updateMenu();
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK_TYPED( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
+IMPL_LINK( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
 {
     sal_Int64 nValue = mpMetric->GetValue();
 
@@ -894,7 +894,7 @@ public:
 
     virtual Control* getControl() override;
 
-    DECL_LINK_TYPED( implMenuSelectHdl, MenuButton*, void );
+    DECL_LINK( implMenuSelectHdl, MenuButton*, void );
 
     void update();
 
@@ -946,7 +946,7 @@ void FontStylePropertyBox::update()
     mpEdit->Invalidate();
 }
 
-IMPL_LINK_TYPED( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
+IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb, void )
 {
     switch( pPb->GetCurItemId() )
     {
@@ -1010,8 +1010,8 @@ public:
     virtual void dispose() override;
 
     void update( STLPropertySet* pSet );
-    DECL_LINK_TYPED( implSelectHdl, ListBox&, void );
-    DECL_LINK_TYPED( implClickHdl, Button*, void );
+    DECL_LINK( implSelectHdl, ListBox&, void );
+    DECL_LINK( implClickHdl, Button*, void );
     void implHdl(Control*);
 
 private:
@@ -1321,11 +1321,11 @@ void CustomAnimationEffectTabPage::updateControlStates()
     mpPBSoundPreview->Enable( nPos >= 2 );
 }
 
-IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void )
+IMPL_LINK( CustomAnimationEffectTabPage, implClickHdl, Button*, pBtn, void )
 {
     implHdl(pBtn);
 }
-IMPL_LINK_TYPED( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void )
+IMPL_LINK( CustomAnimationEffectTabPage, implSelectHdl, ListBox&, rListBox, void )
 {
     implHdl(&rListBox);
 }
@@ -1615,9 +1615,9 @@ public:
 
     void update( STLPropertySet* pSet );
 
-    DECL_LINK_TYPED( implControlHdl, ListBox&, void );
-    DECL_LINK_TYPED( implClickHdl, Button*, void );
-    DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void );
+    DECL_LINK( implControlHdl, ListBox&, void );
+    DECL_LINK( implClickHdl, Button*, void );
+    DECL_LINK( DurationModifiedHdl, Edit&, void );
     void implHdl(Control*);
 
 private:
@@ -1824,17 +1824,17 @@ void CustomAnimationDurationTabPage::dispose()
     TabPage::dispose();
 }
 
-IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void )
+IMPL_LINK( CustomAnimationDurationTabPage, implClickHdl, Button*, pBtn, void )
 {
     implHdl(pBtn);
 }
 
-IMPL_LINK_TYPED( CustomAnimationDurationTabPage, implControlHdl, ListBox&, rListBox, void )
+IMPL_LINK( CustomAnimationDurationTabPage, implControlHdl, ListBox&, rListBox, void )
 {
     implHdl(&rListBox);
 }
 
-IMPL_LINK_NOARG_TYPED(CustomAnimationDurationTabPage, DurationModifiedHdl, Edit&, void)
+IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl, Edit&, void)
 {
     if(!(mpCBXDuration->GetText()).isEmpty() )
     {
@@ -2012,7 +2012,7 @@ public:
     void update( STLPropertySet* pSet );
 
     void updateControlStates();
-    DECL_LINK_TYPED(implSelectHdl, ListBox&, void);
+    DECL_LINK(implSelectHdl, ListBox&, void);
 
 private:
     VclPtr<FixedText>   maFTGroupText;
@@ -2196,7 +2196,7 @@ void CustomAnimationTextAnimTabPage::updateControlStates()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, ListBox&, void)
 {
     updateControlStates();
 }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 1b958ad52a0b..2f4cab1b2648 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -324,7 +324,7 @@ void CustomAnimationPane::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-IMPL_LINK_TYPED(CustomAnimationPane,EventMultiplexerListener,
+IMPL_LINK(CustomAnimationPane,EventMultiplexerListener,
     tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
@@ -2048,24 +2048,24 @@ double CustomAnimationPane::getDuration()
 }
 
 /// this link is called when the property box is modified by the user
-IMPL_LINK_NOARG_TYPED(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void)
+IMPL_LINK_NOARG(CustomAnimationPane, implPropertyHdl, LinkParamNone*, void)
 {
     onChangeProperty();
 }
 
-IMPL_LINK_NOARG_TYPED(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(CustomAnimationPane, AnimationSelectHdl, ListBox&, void)
 {
     animationChange();
 }
 
-IMPL_LINK_NOARG_TYPED(CustomAnimationPane, UpdateAnimationLB, ListBox&, void)
+IMPL_LINK_NOARG(CustomAnimationPane, UpdateAnimationLB, ListBox&, void)
 {
     //FIXME: first effect only? what if there is more?
     CustomAnimationEffectPtr pEffect = maListSelection.front();
     fillAnimationLB( pEffect->hasText() );
 }
 
-IMPL_LINK_NOARG_TYPED(CustomAnimationPane, DurationModifiedHdl, Edit&, void)
+IMPL_LINK_NOARG(CustomAnimationPane, DurationModifiedHdl, Edit&, void)
 {
     if(!(mpCBXDuration->GetText()).isEmpty() )
     {
@@ -2137,11 +2137,11 @@ sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText )
 }
 
 
-IMPL_LINK_TYPED( CustomAnimationPane, implClickHdl, Button*, pBtn, void )
+IMPL_LINK( CustomAnimationPane, implClickHdl, Button*, pBtn, void )
 {
     implControlHdl(pBtn);
 }
-IMPL_LINK_TYPED( CustomAnimationPane, implControlListBoxHdl, ListBox&, rListBox, void )
+IMPL_LINK( CustomAnimationPane, implControlListBoxHdl, ListBox&, rListBox, void )
 {
     implControlHdl(&rListBox);
 }
@@ -2170,7 +2170,7 @@ void CustomAnimationPane::implControlHdl(Control* pControl )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(CustomAnimationPane, lateInitCallback, Timer *, void)
+IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback, Timer *, void)
 {
     // Call getPresets() to initiate the (expensive) construction of the
     // presets list.
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 6fb2e3a2aacd..aabe68c2ffbb 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -122,14 +122,14 @@ private:
     void UpdateLook();
     sal_uInt32 fillAnimationLB( bool bHasText );
 
-    DECL_LINK_TYPED( implControlListBoxHdl, ListBox&, void );
-    DECL_LINK_TYPED( implClickHdl, Button*, void );
-    DECL_LINK_TYPED( implPropertyHdl, LinkParamNone*, void );
-    DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
-    DECL_LINK_TYPED( lateInitCallback, Timer *, void );
-    DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( UpdateAnimationLB, ListBox&, void );
-    DECL_LINK_TYPED( AnimationSelectHdl, ListBox&, void );
+    DECL_LINK( implControlListBoxHdl, ListBox&, void );
+    DECL_LINK( implClickHdl, Button*, void );
+    DECL_LINK( implPropertyHdl, LinkParamNone*, void );
+    DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+    DECL_LINK( lateInitCallback, Timer *, void );
+    DECL_LINK( DurationModifiedHdl, Edit&, void );
+    DECL_LINK( UpdateAnimationLB, ListBox&, void );
+    DECL_LINK( AnimationSelectHdl, ListBox&, void );
     void implControlHdl(Control*);
 
 private:
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 3d42e552a2d2..8da6e5a3e2a8 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -971,7 +971,7 @@ void SlideTransitionPane::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener,
+IMPL_LINK(SlideTransitionPane,EventMultiplexerListener,
     tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
@@ -1022,7 +1022,7 @@ IMPL_LINK_TYPED(SlideTransitionPane,EventMultiplexerListener,
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, ApplyToAllButtonClicked, Button*, void)
+IMPL_LINK_NOARG(SlideTransitionPane, ApplyToAllButtonClicked, Button*, void)
 {
     DBG_ASSERT( mpDrawDoc, "Invalid Draw Document!" );
     if( !mpDrawDoc )
@@ -1047,12 +1047,12 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, ApplyToAllButtonClicked, Button*, voi
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, PlayButtonClicked, Button*, void)
+IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked, Button*, void)
 {
     playCurrentEffect();
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, TransitionSelected, ValueSet *, void)
+IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected, ValueSet *, void)
 {
     updateVariants( mpVS_TRANSITION_ICONS->GetSelectItemId() - 1 );
     applyToSelectedPages();
@@ -1102,23 +1102,23 @@ void SlideTransitionPane::updateVariants( size_t nPresetOffset )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceSlideRadioButtonToggled, RadioButton&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, AdvanceSlideRadioButtonToggled, RadioButton&, void)
 {
     updateControlState();
     applyToSelectedPages(false);
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AdvanceTimeModified, Edit&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, AdvanceTimeModified, Edit&, void)
 {
     applyToSelectedPages(false);
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, VariantListBoxSelected, ListBox&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, VariantListBoxSelected, ListBox&, void)
 {
     applyToSelectedPages();
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, DurationModifiedHdl, Edit&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, DurationModifiedHdl, Edit&, void)
 {
     double duration_value = static_cast<double>(mpCBX_duration->GetValue());
     if(duration_value <= 0.0)
@@ -1127,12 +1127,12 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, DurationModifiedHdl, Edit&, void)
         mpCBX_duration->SetValue(duration_value);
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, DurationLoseFocusHdl, Control&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void)
 {
     applyToSelectedPages();
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, SoundListBoxSelected, ListBox&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected, ListBox&, void)
 {
     if( mpLB_SOUND->GetSelectEntryCount() )
     {
@@ -1147,18 +1147,18 @@ IMPL_LINK_NOARG_TYPED(SlideTransitionPane, SoundListBoxSelected, ListBox&, void)
     applyToSelectedPages();
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LoopSoundBoxChecked, Button*, void)
+IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked, Button*, void)
 {
     applyToSelectedPages();
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, AutoPreviewClicked, Button*, void)
+IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked, Button*, void)
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
     pOptions->SetPreviewTransitions( mpCB_AUTO_PREVIEW->IsChecked() );
 }
 
-IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void)
+IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback, Timer *, void)
 {
     const TransitionPresetList& rPresetList = TransitionPreset::getTransitionPresetList();
 
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index a8faea0ece7c..748402b40fe9 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -793,7 +793,7 @@ void AnnotationManagerImpl::UpdateTags( bool bSynchron )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(AnnotationManagerImpl, UpdateTagsHdl, void*, void)
+IMPL_LINK_NOARG(AnnotationManagerImpl, UpdateTagsHdl, void*, void)
 {
     mnUpdateTagsEvent  = nullptr;
     DisposeTags();
@@ -880,7 +880,7 @@ void AnnotationManagerImpl::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-IMPL_LINK_TYPED(AnnotationManagerImpl,EventMultiplexerListener,
+IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener,
     tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index 623631c6e428..920111e38fb5 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -95,8 +95,8 @@ public:
 
     void invalidateSlots();
 
-    DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
-    DECL_LINK_TYPED(UpdateTagsHdl, void *, void);
+    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(UpdateTagsHdl, void *, void);
 
     void UpdateTags(bool bSynchron = false);
     void CreateTags();
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 80dcf37b580a..647f155c028f 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -610,7 +610,7 @@ void AnnotationTag::ClosePopup()
     }
 }
 
-IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void)
+IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void)
 {
         vcl::Window* pWindow = rEvent.GetWindow();
 
@@ -672,7 +672,7 @@ IMPL_LINK_TYPED(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void
         }
 }
 
-IMPL_LINK_NOARG_TYPED(AnnotationTag, ClosePopupHdl, void*, void)
+IMPL_LINK_NOARG(AnnotationTag, ClosePopupHdl, void*, void)
 {
     mnClosePopupEvent = nullptr;
     ClosePopup();
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 36eb57424ff1..2e8f63ccc49a 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -73,8 +73,8 @@ protected:
     virtual void select() override;
     virtual void deselect() override;
 
-    DECL_LINK_TYPED( WindowEventHandler, VclWindowEvent&, void );
-    DECL_LINK_TYPED( ClosePopupHdl, void*, void );
+    DECL_LINK( WindowEventHandler, VclWindowEvent&, void );
+    DECL_LINK( ClosePopupHdl, void*, void );
 
 private:
     AnnotationManagerImpl& mrManager;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 8e2c8657963a..90e5b78d6fc7 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -488,7 +488,7 @@ long AnnotationWindow::GetPostItTextHeight()
     return mpOutliner ? LogicToPixel(mpOutliner->CalcTextSize()).Height() : 0;
 }
 
-IMPL_LINK_TYPED(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll, void)
+IMPL_LINK(AnnotationWindow, ScrollHdl, ScrollBar*, pScroll, void)
 {
     long nDiff = getView()->GetEditView().GetVisArea().Top() - pScroll->GetThumbPos();
     getView()->Scroll( 0, nDiff );
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 11d01c021564..f99a6f02cedf 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -91,7 +91,7 @@ class AnnotationWindow : public FloatingWindow
         basegfx::B2DPolygon     maPopupTriangle;
 
     protected:
-        DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
+        DECL_LINK(ScrollHdl, ScrollBar*, void);
 
     public:
         AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent );
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 147a1caf5d7a..a838c8bbf785 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -416,7 +416,7 @@ void SdModule::GetState(SfxItemSet& rItemSet)
     }
 }
 
-IMPL_STATIC_LINK_TYPED( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void )
+IMPL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void )
 {
     if( (rSimpleEvent.GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData() )
     {
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 1fcc5ef76b71..c61ebf90874c 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -142,7 +142,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo
 /**
  * Link for CalcFieldValue of Outliners
  */
-IMPL_LINK_TYPED(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
+IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
 {
     if (!pInfo)
         return;
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index ba04c52bdc48..91b35a8b28ed 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -58,8 +58,8 @@ public:
     virtual void dispose() override;
 
 protected:
-    DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void );
-    DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
+    DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
+    DECL_LINK( SelectValueSetHdl, ValueSet*, void );
     void SelectHdl(void*);
 
 private:
@@ -192,11 +192,11 @@ void DisplayModeToolbarMenu::dispose()
     svtools::ToolbarMenu::dispose();
 }
 
-IMPL_LINK_TYPED( DisplayModeToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void )
+IMPL_LINK( DisplayModeToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void )
 {
     SelectHdl(pControl);
 }
-IMPL_LINK_TYPED( DisplayModeToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void )
+IMPL_LINK( DisplayModeToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void )
 {
     SelectHdl(pControl);
 }
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index b85e0c3dfced..8191e7b79793 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -70,8 +70,8 @@ public:
     virtual void dispose() override;
 
 protected:
-    DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void );
-    DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void );
+    DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void );
+    DECL_LINK( SelectValueSetHdl, ValueSet*, void );
     void SelectHdl(void*);
 private:
     SlideLayoutController& mrController;
@@ -267,11 +267,11 @@ void LayoutToolbarMenu::dispose()
     svtools::ToolbarMenu::dispose();
 }
 
-IMPL_LINK_TYPED( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void )
+IMPL_LINK( LayoutToolbarMenu, SelectValueSetHdl, ValueSet*, pControl, void )
 {
     SelectHdl(pControl);
 }
-IMPL_LINK_TYPED( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void )
+IMPL_LINK( LayoutToolbarMenu, SelectToolbarMenuHdl, ToolbarMenu *, pControl, void )
 {
     SelectHdl(pControl);
 }
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index e764048fb54b..94a8632397b5 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -101,12 +101,12 @@ void SdPhotoAlbumDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CancelHdl, Button*, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, CancelHdl, Button*, void)
 {
     Close();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void)
 {
     if (pImagesLst->GetEntryCount() == 0)
     {
@@ -500,7 +500,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, CreateHdl, Button*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void)
 {
     ::sfx2::FileDialogHelper aDlg(
         css::ui::dialogs::TemplateDescription::FILEOPEN_PREVIEW,
@@ -541,7 +541,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl, Button*, void)
 {
     if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND
         && pImagesLst->GetSelectEntryPos() != 0)
@@ -572,7 +572,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, UpHdl, Button*, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void)
 {
     const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos();
     if (!pImagesLst->GetEntry(nActPos + 1).isEmpty())
@@ -600,7 +600,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, DownHdl, Button*, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
 {
     pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() );
     pImg->SetImage(Image());
@@ -608,7 +608,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, RemoveHdl, Button*, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
 {
     OUString* pData = static_cast<OUString*>(pImagesLst->GetSelectEntryData());
     OUString sImgUrl = pData ? OUString(*pData) : "";
@@ -667,7 +667,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, SelectHdl, ListBox&, void)
     EnableDisableButtons();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void)
 {
     // Enable "Fill Slide" only for one image
     // If we want to have it for other images too, we need to implement the actual cropping.
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
index cfcb96c8cfd5..19f8e95868ac 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx
@@ -72,16 +72,16 @@ private:
     SdDrawDocument* pDoc;
     GraphicFilter* mpGraphicFilter;
 
-    DECL_LINK_TYPED(CancelHdl, Button*, void);
-    DECL_LINK_TYPED(CreateHdl, Button*, void);
+    DECL_LINK(CancelHdl, Button*, void);
+    DECL_LINK(CreateHdl, Button*, void);
 
-    DECL_LINK_TYPED(FileHdl, Button*, void);
-    DECL_LINK_TYPED(UpHdl, Button*, void);
-    DECL_LINK_TYPED(DownHdl, Button*, void);
-    DECL_LINK_TYPED(RemoveHdl, Button*, void);
+    DECL_LINK(FileHdl, Button*, void);
+    DECL_LINK(UpHdl, Button*, void);
+    DECL_LINK(DownHdl, Button*, void);
+    DECL_LINK(RemoveHdl, Button*, void);
 
-    DECL_LINK_TYPED(SelectHdl, ListBox&, void);
-    DECL_LINK_TYPED(TypeSelectHdl, ListBox&, void);
+    DECL_LINK(SelectHdl, ListBox&, void);
+    DECL_LINK(TypeSelectHdl, ListBox&, void);
 
     Reference< drawing::XDrawPage > appendNewSlide(AutoLayout aLayout,
         const Reference< drawing::XDrawPages >& xDrawPages);
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index ef1878f0b1b8..7ce3f50da537 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -43,7 +43,7 @@ void RemoteDialog::dispose()
     ModalDialog::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void)
+IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton, Button*, void)
 {
 //     setBusy( true );
     // Fixme: Try and connect
@@ -62,11 +62,11 @@ IMPL_LINK_NOARG_TYPED(RemoteDialog, HandleConnectButton, Button*, void)
 #endif
 }
 
-IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseClickHdl, Button*, void )
+IMPL_LINK_NOARG( RemoteDialog, CloseClickHdl, Button*, void )
 {
     CloseHdl(*this);
 }
-IMPL_LINK_NOARG_TYPED( RemoteDialog, CloseHdl, SystemWindow&, void )
+IMPL_LINK_NOARG( RemoteDialog, CloseHdl, SystemWindow&, void )
 {
 #ifdef ENABLE_SDREMOTE
     RemoteServer::restoreDiscoverable();
diff --git a/sd/source/ui/dlg/RemoteDialog.hxx b/sd/source/ui/dlg/RemoteDialog.hxx
index 27f5cb1bd550..c9ea8f51b6cd 100644
--- a/sd/source/ui/dlg/RemoteDialog.hxx
+++ b/sd/source/ui/dlg/RemoteDialog.hxx
@@ -28,9 +28,9 @@ private:
     VclPtr<CloseButton>    m_pButtonClose;
     VclPtr<ClientBox>      m_pClientBox;
 
-    DECL_LINK_TYPED( HandleConnectButton, Button*, void );
-    DECL_LINK_TYPED( CloseHdl, SystemWindow&, void );
-    DECL_LINK_TYPED( CloseClickHdl, Button*, void );
+    DECL_LINK( HandleConnectButton, Button*, void );
+    DECL_LINK( CloseHdl, SystemWindow&, void );
+    DECL_LINK( CloseClickHdl, Button*, void );
 public:
     explicit RemoteDialog( vcl::Window* pWindow );
     virtual ~RemoteDialog() override;
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index a0861fd0d461..e20fdec12faa 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -716,12 +716,12 @@ void ClientBox::DoScroll( long nDelta )
     m_aScrollBar->SetPosPixel( aNewSBPt );
 }
 
-IMPL_LINK_TYPED( ClientBox, ScrollHdl, ScrollBar*, pScrBar, void )
+IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar, void )
 {
     DoScroll( pScrBar->GetDelta() );
 }
 
-IMPL_LINK_NOARG_TYPED( ClientBox, DeauthoriseHdl, Button*, void )
+IMPL_LINK_NOARG( ClientBox, DeauthoriseHdl, Button*, void )
 {
     long aSelected = GetActiveEntryIndex();
     if ( aSelected < 0 )
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index b625ad8e50b2..f953a0f87c4a 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -125,8 +125,8 @@ class ClientBox : public Control
     bool HandleCursorKey( sal_uInt16 nKeyCode );
     void DeleteRemoved();
 
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
-    DECL_LINK_TYPED( DeauthoriseHdl, Button*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( DeauthoriseHdl, Button*, void );
 
 public:
     ClientBox( vcl::Window* pParent, WinBits nStyle );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index a2cded4fef15..e7f2a837b49d 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -244,18 +244,18 @@ void AnimationWindow::dispose()
     SfxDockingWindow::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickFirstHdl, Button*, void)
+IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl, Button*, void)
 {
     m_nCurrentFrame = (m_FrameList.empty()) ? EMPTY_FRAMELIST : 0;
     UpdateControl();
 }
 
-IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickStopHdl, Button*, void)
+IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl, Button*, void)
 {
     bMovie = false;
 }
 
-IMPL_LINK_TYPED( AnimationWindow, ClickPlayHdl, Button *, p, void )
+IMPL_LINK( AnimationWindow, ClickPlayHdl, Button *, p, void )
 {
     ScopeLockGuard aGuard( maPlayLock );
 
@@ -372,14 +372,14 @@ IMPL_LINK_TYPED( AnimationWindow, ClickPlayHdl, Button *, p, void )
     m_pBtnGetOneObject->Enable( bBtnGetOneObjectEnabled );
 }
 
-IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickLastHdl, Button*, void)
+IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl, Button*, void)
 {
     m_nCurrentFrame =
         (m_FrameList.empty()) ? EMPTY_FRAMELIST : m_FrameList.size() - 1 ;
     UpdateControl();
 }
 
-IMPL_LINK_TYPED( AnimationWindow, ClickRbtHdl, Button*, p, void )
+IMPL_LINK( AnimationWindow, ClickRbtHdl, Button*, p, void )
 {
     if (m_FrameList.empty() || p == m_pRbtGroup || m_pRbtGroup->IsChecked())
     {
@@ -401,7 +401,7 @@ IMPL_LINK_TYPED( AnimationWindow, ClickRbtHdl, Button*, p, void )
     }
 }
 
-IMPL_LINK_TYPED( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void )
+IMPL_LINK( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void )
 {
     bAllObjects = pBtn == m_pBtnGetAllObjects;
 
@@ -412,7 +412,7 @@ IMPL_LINK_TYPED( AnimationWindow, ClickGetObjectHdl, Button*, pBtn, void )
         SID_ANIMATOR_ADD, SfxCallMode::SLOT | SfxCallMode::RECORD, { &aItem });
 }
 
-IMPL_LINK_TYPED( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
+IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
 {
     SdPage*     pPage = pMyDoc->GetSdPage(0, PK_STANDARD);
     SdrObject*  pObject;
@@ -486,7 +486,7 @@ IMPL_LINK_TYPED( AnimationWindow, ClickRemoveBitmapHdl, Button*, pBtn, void )
     UpdateControl();
 }
 
-IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickCreateGroupHdl, Button*, void)
+IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl, Button*, void)
 {
     // Code now in CreatePresObj()
     SfxBoolItem aItem( SID_ANIMATOR_CREATE, true );
@@ -495,7 +495,7 @@ IMPL_LINK_NOARG_TYPED(AnimationWindow, ClickCreateGroupHdl, Button*, void)
             SfxCallMode::SLOT | SfxCallMode::RECORD, { &aItem });
 }
 
-IMPL_LINK_NOARG_TYPED(AnimationWindow, ModifyBitmapHdl, Edit&, void)
+IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl, Edit&, void)
 {
     sal_uLong nBmp = static_cast<sal_uLong>(m_pNumFldBitmap->GetValue());
 
@@ -509,7 +509,7 @@ IMPL_LINK_NOARG_TYPED(AnimationWindow, ModifyBitmapHdl, Edit&, void)
     UpdateControl();
 }
 
-IMPL_LINK_NOARG_TYPED(AnimationWindow, ModifyTimeHdl, Edit&, void)
+IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl, Edit&, void)
 {
     sal_uLong nPos = static_cast<sal_uLong>(m_pNumFldBitmap->GetValue() - 1);
 
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index bf8709923872..be0c2d579812 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -84,7 +84,7 @@ void BreakDlg::dispose()
 }
 
 // Control-Handler for cancel button
-IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void)
+IMPL_LINK_NOARG(BreakDlg, CancelButtonHdl, Button*, void)
 {
     bCancel = true;
     m_pBtnCancel->Disable();
@@ -96,7 +96,7 @@ IMPL_LINK_NOARG_TYPED(BreakDlg, CancelButtonHdl, Button*, void)
  * Every following call should contain the finished actions since the
  * last call of UpDate.
  */
-IMPL_LINK_TYPED( BreakDlg, UpDate, void*, nInit, bool )
+IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
 {
     if(pProgrInfo == nullptr)
       return true;
@@ -165,7 +165,7 @@ short BreakDlg::Execute()
 /**
  * link-method which starts the working function
  */
-IMPL_LINK_NOARG_TYPED(BreakDlg, InitialUpdate, Idle *, void)
+IMPL_LINK_NOARG(BreakDlg, InitialUpdate, Idle *, void)
 {
     pDrView->DoImportMarkedMtf(pProgrInfo);
     EndDialog(RET_OK);
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index f062b1f674ed..e4ed8df8241d 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -218,7 +218,7 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs )
 /**
  * enables and selects end color LB
  */
-IMPL_LINK_NOARG_TYPED(CopyDlg, SelectColorHdl, ListBox&, void)
+IMPL_LINK_NOARG(CopyDlg, SelectColorHdl, ListBox&, void)
 {
     sal_Int32 nPos = m_pLbStartColor->GetSelectEntryPos();
 
@@ -234,7 +234,7 @@ IMPL_LINK_NOARG_TYPED(CopyDlg, SelectColorHdl, ListBox&, void)
 /**
  * sets values of selection
  */
-IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void)
+IMPL_LINK_NOARG(CopyDlg, SetViewData, Button*, void)
 {
     Rectangle aRect = mpView->GetAllMarkedRect();
 
@@ -255,7 +255,7 @@ IMPL_LINK_NOARG_TYPED(CopyDlg, SetViewData, Button*, void)
 /**
  * resets values to default
  */
-IMPL_LINK_NOARG_TYPED(CopyDlg, SetDefault, Button*, void)
+IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void)
 {
     m_pNumFldCopies->SetValue( 1L );
 
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index ea6efb81f1bc..3e3c5d5c4811 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -117,11 +117,11 @@ void SdCustomShowDlg::CheckState()
         pCustomShowList->Seek( nPos );
 }
 
-IMPL_LINK_TYPED( SdCustomShowDlg, ClickButtonHdl, Button *, p, void )
+IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, Button *, p, void )
 {
     SelectHdl(p);
 }
-IMPL_LINK_TYPED( SdCustomShowDlg, SelectListBoxHdl, ListBox&, rListBox, void )
+IMPL_LINK( SdCustomShowDlg, SelectListBoxHdl, ListBox&, rListBox, void )
 {
     SelectHdl(&rListBox);
 }
@@ -266,7 +266,7 @@ void SdCustomShowDlg::SelectHdl(void *p)
 }
 
 // StartShow-Hdl
-IMPL_LINK_NOARG_TYPED(SdCustomShowDlg, StartShowHdl, Button*, void)
+IMPL_LINK_NOARG(SdCustomShowDlg, StartShowHdl, Button*, void)
 {
     EndDialog( RET_YES );
 }
@@ -382,19 +382,19 @@ void SdDefineCustomShowDlg::CheckState()
     m_pBtnRemove->Enable( bCSPages );
 }
 
-IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void )
+IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, Button*, p, void )
 {
     ClickButtonHdl2(p);
 }
-IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void )
+IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl3, SvTreeListBox*, p, void )
 {
     ClickButtonHdl2(p);
 }
-IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonHdl4, ListBox&, rListBox, void )
+IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl4, ListBox&, rListBox, void )
 {
     ClickButtonHdl2(&rListBox);
 }
-IMPL_LINK_TYPED( SdDefineCustomShowDlg, ClickButtonEditHdl, Edit&, rEdit, void )
+IMPL_LINK( SdDefineCustomShowDlg, ClickButtonEditHdl, Edit&, rEdit, void )
 {
     ClickButtonHdl2(&rEdit);
 }
@@ -502,7 +502,7 @@ void SdDefineCustomShowDlg::CheckCustomShow()
 }
 
 // OK-Hdl
-IMPL_LINK_NOARG_TYPED(SdDefineCustomShowDlg, OKHdl, Button*, void)
+IMPL_LINK_NOARG(SdDefineCustomShowDlg, OKHdl, Button*, void)
 {
     // check name...
     bool bDifferent = true;
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 2e33540da81a..57ccd00d0f81 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -312,7 +312,7 @@ void SdModifyFieldDlg::FillControls()
     m_pLbFormat->SaveValue();
 }
 
-IMPL_LINK_NOARG_TYPED(SdModifyFieldDlg, LanguageChangeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdModifyFieldDlg, LanguageChangeHdl, ListBox&, void)
 {
     FillFormatList();
 }
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 7d945dd91e0e..aa0d30375cde 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -133,7 +133,7 @@ void SdSnapLineDlg::dispose()
 /**
  * fills provided item sets with dialog box attributes
  */
-IMPL_LINK_TYPED( SdSnapLineDlg, ClickHdl, Button *, pBtn, void )
+IMPL_LINK( SdSnapLineDlg, ClickHdl, Button *, pBtn, void )
 {
     if ( pBtn == m_pRbPoint )        SetInputFields(true, true);
     else if ( pBtn == m_pRbHorz )    SetInputFields(false, true);
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index c808dbfea8fd..0f0c87d6e04e 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -58,8 +58,8 @@ private:
 
     void CheckSelectionState();
 
-    DECL_LINK_TYPED( PlayMusicHdl, void *, void );
-    DECL_LINK_TYPED( IsMusicStoppedHdl, Idle *, void );
+    DECL_LINK( PlayMusicHdl, void *, void );
+    DECL_LINK( IsMusicStoppedHdl, Idle *, void );
 
 public:
     explicit SdFileDialog_Imp();
@@ -93,7 +93,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, PlayMusicHdl, void*, void)
+IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl, void*, void)
 {
     maUpdateIdle.Stop();
     mnPlaySoundEvent = nullptr;
@@ -156,7 +156,7 @@ IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, PlayMusicHdl, void*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void)
+IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl, Idle *, void)
 {
     SolarMutexGuard aGuard;
 
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 75580215f7e4..e021b59a16e7 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -144,8 +144,8 @@ private:
 
     bool            mbHandoutMode;
 
-    DECL_LINK_TYPED( UpdateOnClickHdl, Button*, void );
-    DECL_LINK_TYPED( LanguageChangeHdl, ListBox&, void );
+    DECL_LINK( UpdateOnClickHdl, Button*, void );
+    DECL_LINK( LanguageChangeHdl, ListBox&, void );
 
     void FillFormatList(int eFormat);
     void GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet );
@@ -253,7 +253,7 @@ void HeaderFooterDialog::dispose()
     TabDialog::dispose();
 }
 
-IMPL_LINK_TYPED( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
+IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, void )
 {
     const sal_uInt16 nId = pTabCtrl->GetCurPageId();
     TabPage* pTabPage = pTabCtrl->GetTabPage( nId );
@@ -262,17 +262,17 @@ IMPL_LINK_TYPED( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl, vo
     maPBApply->Enable( mpCurrentPage != nullptr );
 }
 
-IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void)
+IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl, Button*, void)
 {
     ApplyToAll();
 }
 
-IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickApplyHdl, Button*, void)
+IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl, Button*, void)
 {
     Apply();
 }
 
-IMPL_LINK_NOARG_TYPED(HeaderFooterDialog, ClickCancelHdl, Button*, void)
+IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl, Button*, void)
 {
     Cancel();
 }
@@ -475,7 +475,7 @@ void HeaderFooterTabPage::dispose()
     TabPage::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void)
+IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl, ListBox&, void)
 {
     FillFormatList( (int)reinterpret_cast<sal_IntPtr>(mpCBDateTimeFormat->GetSelectEntryData()) );
 }
@@ -579,7 +579,7 @@ void HeaderFooterTabPage::update()
     mpCTPreview->update( aSettings );
 }
 
-IMPL_LINK_NOARG_TYPED(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void)
+IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl, Button*, void)
 {
     update();
 }
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 5e9ca9680b20..c3a72380845d 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -128,7 +128,7 @@ bool SdInsertPagesObjsDlg::IsRemoveUnnessesaryMasterPages() const
 /**
  * Enabled and selects end-color-LB
  */
-IMPL_LINK_NOARG_TYPED(SdInsertPagesObjsDlg, SelectObjectHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SdInsertPagesObjsDlg, SelectObjectHdl, SvTreeListBox*, void)
 {
     if( m_pLbTree->IsLinkableSelected() )
         m_pCbxLink->Enable();
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 764645493c2f..be2887bb74e3 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -263,7 +263,7 @@ sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const SdDrawDocument* pDoc )
     return pDocShell;
 }
 
-IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
+IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
 {
     sal_uInt16 nId = maToolbox->GetCurItemId();
     PageJump ePage = PAGE_NONE;
@@ -285,7 +285,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
     }
 }
 
-IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
+IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
 {
     sal_uInt16 nId = maToolbox->GetCurItemId();
 
@@ -358,7 +358,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
+IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
 {
     if( !mbDocImported || maLbDocs->GetSelectEntryPos() != 0 )
     {
@@ -395,7 +395,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool)
     return false;
 }
 
-IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
 {
     OUString aStrLb = maLbDocs->GetSelectEntry();
     long   nPos = maLbDocs->GetSelectEntryPos();
@@ -441,7 +441,7 @@ IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectDocumentHdl, ListBox&, void)
  * Set DrageType and set image accordingly to it.
  * If the handler is called with NULL, the default (URL) is set.
  */
-IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool )
 {
     sal_uInt16 nMenuId;
     if( pMenu )
@@ -472,7 +472,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu, bool )
     return false;
 }
 
-IMPL_LINK_TYPED( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu, bool )
+IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu, bool )
 {
     if (pMenu != nullptr)
     {
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index ca06d386936f..df9f29096e2d 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -53,7 +53,7 @@ private:
     VclPtr<NumericField>    m_pNewStartNF;
     bool             mbModified;
 
-    DECL_LINK_TYPED( ImplNewStartHdl, Button*, void );
+    DECL_LINK( ImplNewStartHdl, Button*, void );
 };
 
 SdParagraphNumTabPage::SdParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rAttr )
@@ -155,7 +155,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     mbModified = false;
 }
 
-IMPL_LINK_NOARG_TYPED(SdParagraphNumTabPage, ImplNewStartHdl, Button*, void)
+IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, Button*, void)
 {
     bool bEnable = m_pNewStartCB->IsChecked();
     m_pNewStartNumberCB->Enable(bEnable);
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 14ee529a1085..58ff4cafb6c8 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -318,7 +318,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
 /**
  *      Handler: Enabled/Disabled Listbox "Dias"
  */
-IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangeRangeHdl, Button*, void)
+IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl, Button*, void)
 {
     aLbDias->Enable( aRbtAtDia->IsChecked() );
     aLbCustomshow->Enable( aRbtCustomshow->IsChecked() );
@@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangeRangeHdl, Button*, void)
 /**
  *      Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
  */
-IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ClickWindowPresentationHdl, Button*, void)
+IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl, Button*, void)
 {
     const bool bAuto = aRbtAuto->IsChecked();
     const bool bWindow = aRbtWindow->IsChecked();
@@ -352,7 +352,7 @@ IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ClickWindowPresentationHdl, Button
 /**
  *      Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
  */
-IMPL_LINK_NOARG_TYPED(SdStartPresentationDlg, ChangePauseHdl, Edit&, void)
+IMPL_LINK_NOARG(SdStartPresentationDlg, ChangePauseHdl, Edit&, void)
 {
     aCbxAutoLogo->Enable( aRbtAuto->IsChecked() && ( aTmfPause->GetTime().GetMSFromTime() > 0 ) );
 }
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 4a8f1246be64..dbb4314be83d 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -209,7 +209,7 @@ VclPtr<SfxTabPage> SdPrintOptions::Create( vcl::Window* pWindow,
     return VclPtr<SdPrintOptions>::Create( pWindow, *rOutAttrs );
 }
 
-IMPL_LINK_TYPED( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void )
+IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void )
 {
     // there must be at least one of them checked
     if( !m_pCbxDraw->IsChecked() && !m_pCbxNotes->IsChecked() && !m_pCbxOutline->IsChecked() && !m_pCbxHandout->IsChecked() )
@@ -218,7 +218,7 @@ IMPL_LINK_TYPED( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void )
     updateControls();
 }
 
-IMPL_LINK_NOARG_TYPED(SdPrintOptions, ClickBookletHdl, Button*, void)
+IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl, Button*, void)
 {
     updateControls();
 }
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 8986b719f800..a39c9fdc9fd9 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -168,7 +168,7 @@ void SdPresLayoutDlg::FillValueSet()
 /**
  * DoubleClick handler
  */
-IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
+IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
 {
     EndDialog(RET_OK);
 }
@@ -176,7 +176,7 @@ IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLayoutHdl, ValueSet*, void)
 /**
  * Click handler for load button
  */
-IMPL_LINK_NOARG_TYPED(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
+IMPL_LINK_NOARG(SdPresLayoutDlg, ClickLoadHdl, Button*, void)
 {
     VclPtrInstance< SfxNewFileDialog > pDlg(this, SFXWB_PREVIEW);
     pDlg->SetText(SD_RESSTR(STR_LOAD_PRESENTATION_LAYOUT));
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 0f6303506eb5..56419250aff8 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1364,7 +1364,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt )
 /**
  * Handler for Dragging
  */
-IMPL_LINK_NOARG_TYPED(SdPageObjsTLB, ExecDragHdl, void*, void)
+IMPL_LINK_NOARG(SdPageObjsTLB, ExecDragHdl, void*, void)
 {
     // as link, then it is allowed to asynchronous, without ImpMouseMoveMsg on
     // the stack, delete the Navigator
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 8579ce9f4f4b..df252fbcc333 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -466,12 +466,12 @@ void SdTPAction::OpenFileDialog()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdTPAction, ClickSearchHdl, Button*, void)
+IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl, Button*, void)
 {
     OpenFileDialog();
 }
 
-IMPL_LINK_NOARG_TYPED(SdTPAction, ClickActionHdl, ListBox&, void)
+IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void)
 {
     presentation::ClickAction eCA = GetActualClickAction();
 
@@ -643,12 +643,12 @@ IMPL_LINK_NOARG_TYPED(SdTPAction, ClickActionHdl, ListBox&, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
 {
     m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() );
 }
 
-IMPL_LINK_NOARG_TYPED(SdTPAction, CheckFileHdl, Control&, void)
+IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void)
 {
     OUString aFile( GetEditText() );
 
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 2c57bca14966..8ba8d68cf107 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -535,7 +535,7 @@ VclPtr<SfxTabPage> SdTpOptionsMisc::Create( vcl::Window* pWindow,
     return VclPtr<SdTpOptionsMisc>::Create( pWindow, *rAttrs );
 }
 
-IMPL_LINK_NOARG_TYPED(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void)
+IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void)
 {
     sal_Int32 nPos = m_pLbMetric->GetSelectEntryPos();
 
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 6ef2bae2c17d..685658ae26db 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -260,19 +260,19 @@ void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
     rMtf.AddAction( new MetaRectAction( aRect ) );
 }
 
-IMPL_LINK_TYPED( SdVectorizeDlg, ProgressHdl, long, nData, void )
+IMPL_LINK( SdVectorizeDlg, ProgressHdl, long, nData, void )
 {
     m_pPrgs->SetValue( (sal_uInt16)nData );
 }
 
-IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickPreviewHdl, Button*, void)
+IMPL_LINK_NOARG(SdVectorizeDlg, ClickPreviewHdl, Button*, void)
 {
     Calculate( aBmp, aMtf );
     m_pMtfWin->SetGraphic( aMtf );
     m_pBtnPreview->Disable();
 }
 
-IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickOKHdl, Button*, void)
+IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl, Button*, void)
 {
     if( m_pBtnPreview->IsEnabled() )
         Calculate( aBmp, aMtf );
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ClickOKHdl, Button*, void)
     EndDialog( RET_OK );
 }
 
-IMPL_LINK_TYPED( SdVectorizeDlg, ToggleHdl, CheckBox&, rCb, void )
+IMPL_LINK( SdVectorizeDlg, ToggleHdl, CheckBox&, rCb, void )
 {
     if( rCb.IsChecked() )
     {
@@ -297,7 +297,7 @@ IMPL_LINK_TYPED( SdVectorizeDlg, ToggleHdl, CheckBox&, rCb, void )
     m_pBtnPreview->Enable();
 }
 
-IMPL_LINK_NOARG_TYPED(SdVectorizeDlg, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SdVectorizeDlg, ModifyHdl, Edit&, void)
 {
     m_pBtnPreview->Enable();
 }
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 310f30ff4ac4..c10dbc1c2b34 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -411,7 +411,7 @@ bool DrawDocShell::IsNewPageNameValid( OUString & rInOutPageName, bool bResetStr
     return bCanUseNewName;
 }
 
-IMPL_LINK_TYPED( DrawDocShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool )
+IMPL_LINK( DrawDocShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool )
 {
     OUString aNewName;
     rDialog.GetName( aNewName );
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index c9ee2b62c7c9..f07eb0fbac75 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -438,7 +438,7 @@ void DrawDocShell::SetModified( bool bSet /* = true */ )
  */
 // ExecuteSpellPopup now handled by DrawDocShell. This is necessary
 // to get hands on the outliner and the text object.
-IMPL_LINK_TYPED(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void)
+IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void)
 {
     SdrObject* pObj = nullptr;
     SdrOutliner* pOutl = nullptr;
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 9e116b8b046e..ea8171ac6575 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -110,7 +110,7 @@ void ChangeRequestQueueProcessor::StartProcessing()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ChangeRequestQueueProcessor, ProcessEvent, void*, void)
+IMPL_LINK_NOARG(ChangeRequestQueueProcessor, ProcessEvent, void*, void)
 {
     ::osl::MutexGuard aGuard (maMutex);
 
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
index 725b799ab0be..9acb58fdf25e 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx
@@ -115,7 +115,7 @@ private:
 
     /** Callback function for the PostUserEvent() call.
     */
-    DECL_LINK_TYPED(ProcessEvent, void*, void);
+    DECL_LINK(ProcessEvent, void*, void);
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index df1d5670001f..ecfee501b282 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -364,7 +364,7 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue)
     mbUpdateBeingProcessed = bValue;
 }
 
-IMPL_LINK_NOARG_TYPED(ConfigurationUpdater, TimeoutHandler, Timer *, void)
+IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler, Timer *, void)
 {
     OSL_TRACE("configuration update timer");
     if ( ! mbUpdateBeingProcessed
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 7542cfbe6741..308d00b33ff5 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -197,7 +197,7 @@ private:
     */
     void UnlockUpdates();
 
-    DECL_LINK_TYPED(TimeoutHandler, Timer *, void);
+    DECL_LINK(TimeoutHandler, Timer *, void);
 };
 
 } } // end of namespace sd::framework
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 4003f0a7ba4a..941d938282a3 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -173,7 +173,7 @@ void SAL_CALL FullScreenPane::setAccessible (
     }
 }
 
-IMPL_LINK_TYPED(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void)
+IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void)
 {
     switch (rEvent.GetId())
     {
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index e8911503c907..c299e3f97c9f 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -71,7 +71,7 @@ public:
         const css::uno::Reference<css::accessibility::XAccessible>& rxAccessible)
         throw (css::uno::RuntimeException, std::exception) override;
 
-    DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
+    DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
 
 protected:
     virtual css::uno::Reference<css::rendering::XCanvas>
diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx
index a37cf5faafb2..cf4fe2d907e5 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.cxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.cxx
@@ -118,7 +118,7 @@ void SAL_CALL ShellStackGuard::disposing (
         }
 }
 
-IMPL_LINK_TYPED(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void)
+IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle, void)
 {
 #ifdef DEBUG
     OSL_ASSERT(pIdle==&maPrinterPollingIdle);
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index 07bef965e3a3..3dc138afaebc 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -87,7 +87,7 @@ private:
     std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
     Idle maPrinterPollingIdle;
 
-    DECL_LINK_TYPED(TimeoutHandler, Idle*, void);
+    DECL_LINK(TimeoutHandler, Idle*, void);
 
     /** Return <TRUE/> when the printer is printing.  Return <FALSE/> when
         the printer is not printing, or there is no printer, or something
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index d7de0b6cfab4..4f58e0fb87a7 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -175,7 +175,7 @@ void FuPoor::ForceScroll(const Point& aPixPos)
 /**
  * timer handler for window scrolling
  */
-IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void)
+IMPL_LINK_NOARG(FuPoor, ScrollHdl, Timer *, void)
 {
     Point aPnt(mpWindow->GetPointerPosPixel());
 
@@ -948,7 +948,7 @@ void FuPoor::DoPasteUnformatted()
 /**
  * Timer handler for Drag&Drop
  */
-IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, Timer *, void)
+IMPL_LINK_NOARG(FuPoor, DragHdl, Timer *, void)
 {
     if( mpView )
     {
@@ -973,7 +973,7 @@ bool FuPoor::Command(const CommandEvent& rCEvt)
 /**
  * Timer handler for window scrolling
  */
-IMPL_LINK_NOARG_TYPED(FuPoor, DelayHdl, Timer *, void)
+IMPL_LINK_NOARG(FuPoor, DelayHdl, Timer *, void)
 {
     aDelayToScrollTimer.Stop ();
     bScrollable = true;
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
index cbd1f747ad65..521957d81081 100644
--- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
+++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx
@@ -125,7 +125,7 @@ public:
     /** Define callback for listening to window child events of VCL.
         Listen for creation or destruction of OLE objects.
     */
-    DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void );
+    DECL_LINK( WindowChildEventListener, VclWindowEvent&, void );
 
     //=====  IAccessibleViewForwarderListener  ================================
 
diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
index f22937128b85..a4afdc8a21f8 100644
--- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
+++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx
@@ -76,7 +76,7 @@ namespace accessibility
         AccessibleOutlineEditSource( const AccessibleOutlineEditSource& ) = delete;
         AccessibleOutlineEditSource& operator=( const AccessibleOutlineEditSource& ) = delete;
 
-        DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
+        DECL_LINK( NotifyHdl, EENotify&, void );
 
         SdrView&                        mrView;
         const vcl::Window& mrWindow;
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index 6c4c93dc243a..7028e4aececb 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -71,9 +71,9 @@ private:
     SvdProgressInfo *pProgrInfo;
     SfxProgress     *mpProgress;
 
-    DECL_LINK_TYPED( CancelButtonHdl, Button*, void );
-    DECL_LINK_TYPED( UpDate, void*, bool );
-    DECL_LINK_TYPED( InitialUpdate, Idle*, void );
+    DECL_LINK( CancelButtonHdl, Button*, void );
+    DECL_LINK( UpDate, void*, bool );
+    DECL_LINK( InitialUpdate, Idle*, void );
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 8ae7b8347c5a..fef687086961 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -194,10 +194,10 @@ public:
     */
     virtual OutputDevice* GetDocumentRefDev() override;
 
-    DECL_LINK_TYPED( RenameSlideHdl, AbstractSvxNameDialog&, bool );
+    DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool );
 
     // ExecuteSpellPopup now handled by DrawDocShell
-    DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void );
+    DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void );
 
     void                    ClearUndoBuffer();
 
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 76c12b5df5f2..784c211588ff 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -384,10 +384,10 @@ protected:
     bool                mbReadOnly;
     static bool         mbPipette;
 
-                    DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void );
-                    DECL_LINK_TYPED( TabSplitHdl, TabBar *, void );
-                    DECL_LINK_TYPED( NameObjectHdl, AbstractSvxObjectNameDialog&, bool );
-                    DECL_LINK_TYPED( RenameSlideHdl, AbstractSvxNameDialog&, bool );
+                    DECL_LINK( ClipboardChanged, TransferableDataHelper*, void );
+                    DECL_LINK( TabSplitHdl, TabBar *, void );
+                    DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool );
+                    DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog&, bool );
 
     void            DeleteActualPage();
     void            DeleteActualLayer();
diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx
index c63773bcb871..83c9871aedf4 100644
--- a/sd/source/ui/inc/FormShellManager.hxx
+++ b/sd/source/ui/inc/FormShellManager.hxx
@@ -108,18 +108,18 @@ private:
         when the window gets the focus.  In this case the form shell is
         moved to the bottom of the shell stack.
     */
-    DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
+    DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
 
     /** This call back is called when view in the center pane is replaced.
         When this happens then we unregister at the window of the old and
         register at the window of the new shell.
     */
-    DECL_LINK_TYPED(ConfigurationUpdateHandler, ::sd::tools::EventMultiplexerEvent&, void);
+    DECL_LINK(ConfigurationUpdateHandler, ::sd::tools::EventMultiplexerEvent&, void);
 
     /** This call back is called by the form shell when it gets the focus.
         In this case the form shell is moved to the top of the shell stack.
     */
-    DECL_LINK_TYPED(FormControlActivated, LinkParamNone*, void);
+    DECL_LINK(FormControlActivated, LinkParamNone*, void);
 
     /** This method is called by the form shell when that is destroyed.  It
         acts as a last resort against referencing a dead form shell.  With
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index af61c547f18d..ddbf768d8192 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -95,17 +95,17 @@ public:
     void Paint (const Rectangle& rRect, ::sd::Window* pWin);
 
                     // Callbacks fuer LINKs
-    DECL_LINK_TYPED( ParagraphInsertedHdl, ::Outliner *, void );
-    DECL_LINK_TYPED( ParagraphRemovingHdl, ::Outliner *, void );
-    DECL_LINK_TYPED( DepthChangedHdl, ::Outliner *, void );
-    DECL_LINK_TYPED( StatusEventHdl, EditStatus&, void );
-    DECL_LINK_TYPED( BeginMovingHdl, ::Outliner *, void );
-    DECL_LINK_TYPED( EndMovingHdl, ::Outliner *, void );
-    DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool );
-    DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, bool );
-    DECL_LINK_TYPED( BeginDropHdl, EditView*, void );
-    DECL_LINK_TYPED( EndDropHdl, EditView*, void );
-    DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void );
+    DECL_LINK( ParagraphInsertedHdl, ::Outliner *, void );
+    DECL_LINK( ParagraphRemovingHdl, ::Outliner *, void );
+    DECL_LINK( DepthChangedHdl, ::Outliner *, void );
+    DECL_LINK( StatusEventHdl, EditStatus&, void );
+    DECL_LINK( BeginMovingHdl, ::Outliner *, void );
+    DECL_LINK( EndMovingHdl, ::Outliner *, void );
+    DECL_LINK( RemovingPagesHdl, OutlinerView *, bool );
+    DECL_LINK( IndentingPagesHdl, OutlinerView *, bool );
+    DECL_LINK( BeginDropHdl, EditView*, void );
+    DECL_LINK( EndDropHdl, EditView*, void );
+    DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo*, void );
 
     sal_uLong         GetPaperWidth() { return mnPaperWidth;}
 
@@ -198,9 +198,9 @@ private:
     /** this link is called from the vcl application when the stylesettings
         change. Its only purpose is to call onUpdateStyleSettings() then.
     */
-    DECL_LINK_TYPED( AppEventListenerHdl, VclSimpleEvent&, void );
+    DECL_LINK( AppEventListenerHdl, VclSimpleEvent&, void );
 
-    DECL_LINK_TYPED(EventMultiplexerListener, sd::tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerListener, sd::tools::EventMultiplexerEvent&, void);
 
     /** holds a model guard during drag and drop between BeginMovingHdl and EndMovingHdl */
     std::unique_ptr< OutlineViewModelChangeGuard > maDragAndDropModelGuard;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index b5cb1266e823..6da882f29d99 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -157,7 +157,7 @@ private:
     bool mbInitialized;
 
     void Construct (DrawDocShell* pDocSh);
-    DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void );
+    DECL_LINK( ClipboardChanged, TransferableDataHelper*, void );
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index 2fd437959063..221eade120ca 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -96,20 +96,20 @@ private:
 
     void Initialize(SdDrawDocument* pDoc);
 
-    DECL_LINK_TYPED( ApplyToAllButtonClicked, Button*, void );
-    DECL_LINK_TYPED( PlayButtonClicked, Button*, void );
-    DECL_LINK_TYPED( AutoPreviewClicked, Button*, void );
-
-    DECL_LINK_TYPED( TransitionSelected, ValueSet *, void );
-    DECL_LINK_TYPED( AdvanceSlideRadioButtonToggled, RadioButton&, void );
-    DECL_LINK_TYPED( AdvanceTimeModified, Edit&, void );
-    DECL_LINK_TYPED( VariantListBoxSelected, ListBox&, void );
-    DECL_LINK_TYPED( DurationModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( DurationLoseFocusHdl, Control&, void );
-    DECL_LINK_TYPED( SoundListBoxSelected, ListBox&, void );
-    DECL_LINK_TYPED( LoopSoundBoxChecked, Button*, void );
-    DECL_LINK_TYPED( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
-    DECL_LINK_TYPED(LateInitCallback, Timer *, void);
+    DECL_LINK( ApplyToAllButtonClicked, Button*, void );
+    DECL_LINK( PlayButtonClicked, Button*, void );
+    DECL_LINK( AutoPreviewClicked, Button*, void );
+
+    DECL_LINK( TransitionSelected, ValueSet *, void );
+    DECL_LINK( AdvanceSlideRadioButtonToggled, RadioButton&, void );
+    DECL_LINK( AdvanceTimeModified, Edit&, void );
+    DECL_LINK( VariantListBoxSelected, ListBox&, void );
+    DECL_LINK( DurationModifiedHdl, Edit&, void );
+    DECL_LINK( DurationLoseFocusHdl, Control&, void );
+    DECL_LINK( SoundListBoxSelected, ListBox&, void );
+    DECL_LINK( LoopSoundBoxChecked, Button*, void );
+    DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+    DECL_LINK(LateInitCallback, Timer *, void);
 
     ViewShellBase &   mrBase;
     SdDrawDocument *  mpDrawDoc;
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 8c44cb83d185..015548d44c92 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -236,8 +236,8 @@ public:
     SdrObject* GetSelectedSingleObject(SdPage* pPage);
 
 protected:
-    DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void );
-    DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void );
+    DECL_LINK( OnParagraphInsertedHdl, ::Outliner *, void );
+    DECL_LINK( OnParagraphRemovingHdl, ::Outliner *, void );
 
     virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfo ) override;
     virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfo ) override;
@@ -257,9 +257,9 @@ protected:
     sal_uInt16              mnLockRedrawSmph;
     bool                    mbIsDropAllowed;
 
-                            DECL_LINK_TYPED( DropErrorHdl, Idle*, void );
-                            DECL_LINK_TYPED( DropInsertFileHdl, Idle*, void );
-                            DECL_LINK_TYPED( ExecuteNavigatorDrop, void*, void );
+                            DECL_LINK( DropErrorHdl, Idle*, void );
+                            DECL_LINK( DropInsertFileHdl, Idle*, void );
+                            DECL_LINK( ExecuteNavigatorDrop, void*, void );
 
     void ImplClearDrawDropMarker();
 
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index ef06d29524b8..5d899f8e56b4 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -505,8 +505,8 @@ protected:
     void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq);
     void ImpSidRedo(bool bDrawViewShell, SfxRequest& rReq);
 
-    DECL_LINK_TYPED( HScrollHdl, ScrollBar *, void );
-    DECL_LINK_TYPED( VScrollHdl, ScrollBar *, void );
+    DECL_LINK( HScrollHdl, ScrollBar *, void );
+    DECL_LINK( VScrollHdl, ScrollBar *, void );
 
     // virtual scroll handler, here, derivative classes can add themselves here
     virtual void VirtHScrollHdl(ScrollBar* pHScroll);
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 291fb201698d..cdcf95bf6444 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -72,7 +72,7 @@ public:
                 when IsUICaptured() returns <TRUE/>.
         */
         void Release (bool bForce = false);
-        DECL_LINK_TYPED(TimeoutCallback, Timer *, void);
+        DECL_LINK(TimeoutCallback, Timer *, void);
     private:
         ::std::unique_ptr<ToolBarManager::UpdateLock> mpLock;
         /** The timer is used both as a safe guard to unlock the update lock
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index f49c418274ca..c74a2a19ac4f 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -133,16 +133,16 @@ private:
 
     ScopeLock       maPlayLock;
 
-    DECL_LINK_TYPED( ClickFirstHdl, Button*, void );
-    DECL_LINK_TYPED( ClickStopHdl, Button*, void );
-    DECL_LINK_TYPED( ClickPlayHdl, Button*, void );
-    DECL_LINK_TYPED( ClickLastHdl, Button*, void );
-    DECL_LINK_TYPED( ClickGetObjectHdl, Button*, void );
-    DECL_LINK_TYPED( ClickRemoveBitmapHdl, Button*, void );
-    DECL_LINK_TYPED( ClickRbtHdl, Button*, void );
-    DECL_LINK_TYPED( ClickCreateGroupHdl, Button*, void );
-    DECL_LINK_TYPED( ModifyBitmapHdl, Edit&, void );
-    DECL_LINK_TYPED( ModifyTimeHdl, Edit&, void );
+    DECL_LINK( ClickFirstHdl, Button*, void );
+    DECL_LINK( ClickStopHdl, Button*, void );
+    DECL_LINK( ClickPlayHdl, Button*, void );
+    DECL_LINK( ClickLastHdl, Button*, void );
+    DECL_LINK( ClickGetObjectHdl, Button*, void );
+    DECL_LINK( ClickRemoveBitmapHdl, Button*, void );
+    DECL_LINK( ClickRbtHdl, Button*, void );
+    DECL_LINK( ClickCreateGroupHdl, Button*, void );
+    DECL_LINK( ModifyBitmapHdl, Edit&, void );
+    DECL_LINK( ModifyTimeHdl, Edit&, void );
 
     void            UpdateControl(bool bDisableCtrls = false);
     void            ResetAttrs();
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index 8c979b836ad4..98ac00ab7318 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -69,9 +69,9 @@ private:
     Fraction            maUIScale;
     ::sd::View*         mpView;
 
-    DECL_LINK_TYPED( SelectColorHdl, ListBox&, void );
-    DECL_LINK_TYPED( SetViewData, Button*, void );
-    DECL_LINK_TYPED( SetDefault, Button*, void );
+    DECL_LINK( SelectColorHdl, ListBox&, void );
+    DECL_LINK( SetViewData, Button*, void );
+    DECL_LINK( SetDefault, Button*, void );
 };
 
 } // end of namespace sd
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index ca49b4c0142a..068d5d1e4bcc 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -51,9 +51,9 @@ private:
 
     void            CheckState();
 
-    DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
-    DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void );
-    DECL_LINK_TYPED( StartShowHdl, Button*, void );
+    DECL_LINK( ClickButtonHdl, Button*, void );
+    DECL_LINK( SelectListBoxHdl, ListBox&, void );
+    DECL_LINK( StartShowHdl, Button*, void );
     void SelectHdl(void*);
 
 public:
@@ -84,11 +84,11 @@ private:
     void            CheckState();
     void            CheckCustomShow();
 
-    DECL_LINK_TYPED( ClickButtonHdl, Button*, void );
-    DECL_LINK_TYPED( ClickButtonEditHdl, Edit&, void );
-    DECL_LINK_TYPED( ClickButtonHdl3, SvTreeListBox*, void );
-    DECL_LINK_TYPED( ClickButtonHdl4, ListBox&, void );
-    DECL_LINK_TYPED( OKHdl, Button*, void );
+    DECL_LINK( ClickButtonHdl, Button*, void );
+    DECL_LINK( ClickButtonEditHdl, Edit&, void );
+    DECL_LINK( ClickButtonHdl3, SvTreeListBox*, void );
+    DECL_LINK( ClickButtonHdl4, ListBox&, void );
+    DECL_LINK( OKHdl, Button*, void );
     void ClickButtonHdl2(void*);
 
 public:
diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx
index e36869ae49ea..69e194f8ba55 100644
--- a/sd/source/ui/inc/dlgfield.hxx
+++ b/sd/source/ui/inc/dlgfield.hxx
@@ -45,7 +45,7 @@ private:
     void                FillFormatList();
     void                FillControls();
 
-    DECL_LINK_TYPED( LanguageChangeHdl, ListBox&, void );
+    DECL_LINK( LanguageChangeHdl, ListBox&, void );
 
 public:
     SdModifyFieldDlg( vcl::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet );
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index 138d4e331f53..a297795a5ae7 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -55,7 +55,7 @@ private:
     FieldUnit           eUIUnit;
     Fraction            aUIScale;
 
-    DECL_LINK_TYPED( ClickHdl, Button *, void );
+    DECL_LINK( ClickHdl, Button *, void );
 
 public:
     SdSnapLineDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView);
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index b4534ef7f3d5..ffa4655545bb 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -119,7 +119,7 @@ protected:
         SfxRequest& rReq);
     virtual ~FuPoor() override;
 
-    DECL_LINK_TYPED( DelayHdl, Timer *, void );
+    DECL_LINK( DelayHdl, Timer *, void );
 
     static void ImpForceQuadratic(Rectangle& rRect);
 
@@ -153,11 +153,11 @@ protected:
     VclPtr<Dialog>             pDialog;
 
     Timer               aScrollTimer;           ///< for auto-scrolling
-    DECL_LINK_TYPED( ScrollHdl, Timer *, void );
+    DECL_LINK( ScrollHdl, Timer *, void );
     void ForceScroll(const Point& aPixPos);
 
     Timer               aDragTimer;             ///< for Drag&Drop
-    DECL_LINK_TYPED(DragHdl, Timer *, void);
+    DECL_LINK(DragHdl, Timer *, void);
     bool            bIsInDragMode;
     Point               aMDPos;                 ///< position of MouseButtonDown
 
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 5a2872e625e2..77a932fca101 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -37,10 +37,10 @@ class HeaderFooterTabPage;
 class HeaderFooterDialog : public TabDialog
 {
 private:
-    DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void );
-    DECL_LINK_TYPED( ClickApplyToAllHdl, Button*, void );
-    DECL_LINK_TYPED( ClickApplyHdl, Button*, void );
-    DECL_LINK_TYPED( ClickCancelHdl, Button*, void );
+    DECL_LINK( ActivatePageHdl, TabControl*, void );
+    DECL_LINK( ClickApplyToAllHdl, Button*, void );
+    DECL_LINK( ClickApplyHdl, Button*, void );
+    DECL_LINK( ClickCancelHdl, Button*, void );
 
     VclPtr<TabControl>      mpTabCtrl;
 
diff --git a/sd/source/ui/inc/inspagob.hxx b/sd/source/ui/inc/inspagob.hxx
index cbe108de5891..af2c47ca14bf 100644
--- a/sd/source/ui/inc/inspagob.hxx
+++ b/sd/source/ui/inc/inspagob.hxx
@@ -38,7 +38,7 @@ private:
     const OUString&         rName;
 
     void                    Reset();
-    DECL_LINK_TYPED( SelectObjectHdl, SvTreeListBox*, void );
+    DECL_LINK( SelectObjectHdl, SvTreeListBox*, void );
 
 public:
                 SdInsertPagesObjsDlg( vcl::Window* pParent,
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 9474ac632dbe..c3df8361462c 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -138,12 +138,12 @@ private:
     static sal_uInt16           GetDragTypeSdResId( NavigatorDragType eDT, bool bImage );
     NavDocInfo*                 GetDocInfo();
 
-                                DECL_LINK_TYPED( SelectToolboxHdl, ToolBox *, void );
-                                DECL_LINK_TYPED( DropdownClickToolBoxHdl, ToolBox *, void );
-                                DECL_LINK_TYPED( ClickObjectHdl, SvTreeListBox*, bool );
-                                DECL_LINK_TYPED( SelectDocumentHdl, ListBox&, void );
-                                DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool );
-                                DECL_LINK_TYPED( ShapeFilterCallback, Menu *, bool );
+                                DECL_LINK( SelectToolboxHdl, ToolBox *, void );
+                                DECL_LINK( DropdownClickToolBoxHdl, ToolBox *, void );
+                                DECL_LINK( ClickObjectHdl, SvTreeListBox*, bool );
+                                DECL_LINK( SelectDocumentHdl, ListBox&, void );
+                                DECL_LINK( MenuSelectHdl, Menu *, bool );
+                                DECL_LINK( ShapeFilterCallback, Menu *, bool );
 
     virtual void                DataChanged( const DataChangedEvent& rDCEvt ) override;
     void                        SetDragImage();
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index 99bf183f10b2..f627bcf419ea 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -68,9 +68,9 @@ private:
     VclPtr<FixedText>          msMonitorExternal;
     VclPtr<FixedText>          msExternal;
 
-                        DECL_LINK_TYPED( ChangeRangeHdl, Button*, void );
-                        DECL_LINK_TYPED( ClickWindowPresentationHdl, Button*, void );
-                        DECL_LINK_TYPED( ChangePauseHdl, Edit&, void );
+                        DECL_LINK( ChangeRangeHdl, Button*, void );
+                        DECL_LINK( ClickWindowPresentationHdl, Button*, void );
+                        DECL_LINK( ChangePauseHdl, Edit&, void );
 
     void                InitMonitorSettings();
     enum DisplayType {
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 005715ecb1ae..3b64109e1dc5 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -52,8 +52,8 @@ private:
     VclPtr<CheckBox>            m_pCbxBack;
     VclPtr<CheckBox>            m_pCbxPaperbin;
 
-    DECL_LINK_TYPED( ClickCheckboxHdl, Button*, void );
-    DECL_LINK_TYPED( ClickBookletHdl, Button*, void );
+    DECL_LINK( ClickCheckboxHdl, Button*, void );
+    DECL_LINK( ClickBookletHdl, Button*, void );
 
     void updateControls();
 
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 0ae10d96758f..a3dd272c59e1 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -177,21 +177,21 @@ private:
 
     void    LoadPreviewButtons();
 
-    DECL_LINK_TYPED( FinishHdl, Button*, void );
-    DECL_LINK_TYPED( NextPageHdl, Button*, void );
-    DECL_LINK_TYPED( LastPageHdl, Button*, void );
-
-    DECL_LINK_TYPED( DesignHdl, Button*, void );
-    DECL_LINK_TYPED( DesignSelectHdl, ListBox&, void );
-    DECL_LINK_TYPED( DesignDeleteHdl, Button*, void );
-    DECL_LINK_TYPED( BaseHdl, Button*, void );
-    DECL_LINK_TYPED( ContentHdl, Button*, void );
-    DECL_LINK_TYPED( GfxFormatHdl, Button *, void );
-    DECL_LINK_TYPED( ResolutionHdl, Button*, void );
-    DECL_LINK_TYPED( ButtonsHdl, ValueSet*, void );
-    DECL_LINK_TYPED( ColorHdl, Button*, void );
-    DECL_LINK_TYPED( WebServerHdl, Button *, void );
-    DECL_LINK_TYPED( SlideChgHdl, Button*, void );
+    DECL_LINK( FinishHdl, Button*, void );
+    DECL_LINK( NextPageHdl, Button*, void );
+    DECL_LINK( LastPageHdl, Button*, void );
+
+    DECL_LINK( DesignHdl, Button*, void );
+    DECL_LINK( DesignSelectHdl, ListBox&, void );
+    DECL_LINK( DesignDeleteHdl, Button*, void );
+    DECL_LINK( BaseHdl, Button*, void );
+    DECL_LINK( ContentHdl, Button*, void );
+    DECL_LINK( GfxFormatHdl, Button *, void );
+    DECL_LINK( ResolutionHdl, Button*, void );
+    DECL_LINK( ButtonsHdl, ValueSet*, void );
+    DECL_LINK( ColorHdl, Button*, void );
+    DECL_LINK( WebServerHdl, Button *, void );
+    DECL_LINK( SlideChgHdl, Button*, void );
 
 public:
 
diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index 6f76c9f2113a..a36351e41961 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -46,8 +46,8 @@ public:
 
     void                GetAttr(SfxItemSet& rOutAttrs);
 
-    DECL_LINK_TYPED(ClickLayoutHdl, ValueSet*, void);
-    DECL_LINK_TYPED(ClickLoadHdl, Button*, void);
+    DECL_LINK(ClickLayoutHdl, ValueSet*, void);
+    DECL_LINK(ClickLoadHdl, Button*, void);
 
 private:
     ::sd::DrawDocShell* mpDocSh;
diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx
index af9459673975..ee00a4a8c677 100644
--- a/sd/source/ui/inc/sdtreelb.hxx
+++ b/sd/source/ui/inc/sdtreelb.hxx
@@ -163,7 +163,7 @@ protected:
         const SdrObject* pObject,
         const bool bCreate = true) const;
     void                    CloseBookmarkDoc();
-                            DECL_LINK_TYPED(ExecDragHdl, void*, void);
+                            DECL_LINK(ExecDragHdl, void*, void);
 
     /** Handle the reordering of entries in the navigator.  This method
         reorders both the involved shapes in their page as well as the
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx
index 6ed9dcace102..2a10e3470e81 100644
--- a/sd/source/ui/inc/slideshow.hxx
+++ b/sd/source/ui/inc/slideshow.hxx
@@ -182,7 +182,7 @@ public:
 private:
     SlideShow( SdDrawDocument* pDoc );
 
-    DECL_LINK_TYPED( StartInPlacePresentationConfigurationHdl, void *, void );
+    DECL_LINK( StartInPlacePresentationConfigurationHdl, void *, void );
     void StartInPlacePresentationConfigurationCallback();
 
     void StartInPlacePresentation();
diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx
index 6320db7037d7..25d4cae9c34a 100644
--- a/sd/source/ui/inc/tools/AsynchronousCall.hxx
+++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx
@@ -71,7 +71,7 @@ private:
         function is called the next time.  This pointer may be NULL.
     */
     ::std::unique_ptr<AsynchronousFunction> mpFunction;
-    DECL_LINK_TYPED(TimerCallback,Timer*,void);
+    DECL_LINK(TimerCallback,Timer*,void);
 };
 
 } } // end of namespace ::sd::tools
diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
index d08a084df04a..26207772b40b 100644
--- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
+++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx
@@ -83,7 +83,7 @@ private:
     class Deleter;
     friend class Deleter;
 
-    DECL_LINK_TYPED(TimerCallback, Timer *, void);
+    DECL_LINK(TimerCallback, Timer *, void);
 };
 
 } } // end of namespace ::sd::tools
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 253660e0f501..f461eca4f0ba 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -78,10 +78,10 @@ private:
     OUString                aLastFile;
     ::std::vector< long >   aVerbVector;
 
-    DECL_LINK_TYPED( ClickSearchHdl, Button*, void );
-    DECL_LINK_TYPED( ClickActionHdl, ListBox&, void );
-    DECL_LINK_TYPED( SelectTreeHdl, SvTreeListBox*, void );
-    DECL_LINK_TYPED( CheckFileHdl, Control&, void );
+    DECL_LINK( ClickSearchHdl, Button*, void );
+    DECL_LINK( ClickActionHdl, ListBox&, void );
+    DECL_LINK( SelectTreeHdl, SvTreeListBox*, void );
+    DECL_LINK( CheckFileHdl, Control&, void );
 
     void                    UpdateTree();
     void                    OpenFileDialog();
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 428f5f173477..0c4e906185c1 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -117,7 +117,7 @@ private:
     static OUString        GetScale( sal_Int32 nX, sal_Int32 nY );
     static bool            SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY );
 
-    DECL_LINK_TYPED( SelectMetricHdl_Impl, ListBox&, void );
+    DECL_LINK( SelectMetricHdl_Impl, ListBox&, void );
 
     /** Enable or disable the controls in the compatibility section of the
         'general' tab page depending on whether there is at least one
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index 8b63d42ccc15..4422687d1934 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -71,11 +71,11 @@ class SdVectorizeDlg : public ModalDialog
     void                AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
                                  long nPosX, long nPosY, long nWidth, long nHeight );
 
-                        DECL_LINK_TYPED( ProgressHdl, long, void );
-                        DECL_LINK_TYPED( ClickPreviewHdl, Button*, void );
-                        DECL_LINK_TYPED( ClickOKHdl, Button*, void );
-                        DECL_LINK_TYPED( ToggleHdl, CheckBox&, void );
-                        DECL_LINK_TYPED( ModifyHdl, Edit&, void );
+                        DECL_LINK( ProgressHdl, long, void );
+                        DECL_LINK( ClickPreviewHdl, Button*, void );
+                        DECL_LINK( ClickOKHdl, Button*, void );
+                        DECL_LINK( ToggleHdl, CheckBox&, void );
+                        DECL_LINK( ModifyHdl, Edit&, void );
 
 public:
 
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index aa77b261e61c..29b796857e36 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -40,8 +40,8 @@ public:
     void onZoomChanged();
     void UpdateTags();
 
-    DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
-    DECL_LINK_TYPED(UpdateTagsHdl, void *, void);
+    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(UpdateTagsHdl, void *, void);
 
     bool CreateTags();
     bool DisposeTags();
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
index ca56effd9f68..90202e8138b4 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx
@@ -87,7 +87,7 @@ void CanvasUpdateRequester::RequestUpdate (const bool bUpdateAll)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(CanvasUpdateRequester, Callback, void*, void)
+IMPL_LINK_NOARG(CanvasUpdateRequester, Callback, void*, void)
 {
     mnUserEventId = nullptr;
     if (mxCanvas.is())
diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
index c9662b7d2a14..a712cc502200 100644
--- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx
+++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx
@@ -64,7 +64,7 @@ private:
     css::uno::Reference<css::rendering::XSpriteCanvas> mxCanvas;
     ImplSVEvent * mnUserEventId;
     bool mbUpdateFlag;
-    DECL_LINK_TYPED(Callback, void*, void);
+    DECL_LINK(Callback, void*, void);
 };
 
 } } // end of namespace ::sd::presenter
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 232aedbce1e4..71f4bd069bb7 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -250,7 +250,7 @@ void CurrentMasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
     MasterPagesSelector::ProcessPopupMenu(rMenu);
 }
 
-IMPL_LINK_TYPED(CurrentMasterPagesSelector,EventMultiplexerListener,
+IMPL_LINK(CurrentMasterPagesSelector,EventMultiplexerListener,
     sd::tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index a2a3687035ba..8f3daac12267 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -71,7 +71,7 @@ private:
 
     virtual void LateInit() override;
 
-    DECL_LINK_TYPED(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent&, void);
 };
 
 } } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index df4767b34813..0db30c761f61 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -369,7 +369,7 @@ int LayoutMenu::CalculateRowCount (const Size&, int nColumnCount)
     return nRowCount;
 }
 
-IMPL_LINK_NOARG_TYPED(LayoutMenu, ClickHandler, ValueSet*, void)
+IMPL_LINK_NOARG(LayoutMenu, ClickHandler, ValueSet*, void)
 {
     AssignLayoutToSelectedSlides( GetSelectedAutoLayout() );
 }
@@ -637,12 +637,12 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(LayoutMenu, StateChangeHandler, const OUString&, void)
+IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler, const OUString&, void)
 {
     InvalidateContent();
 }
 
-IMPL_LINK_TYPED(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool)
+IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu, bool)
 {
     if (pMenu == nullptr)
     {
@@ -706,7 +706,7 @@ void LayoutMenu::UpdateSelection()
         SetNoSelection();
 }
 
-IMPL_LINK_TYPED(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
@@ -738,7 +738,7 @@ IMPL_LINK_TYPED(LayoutMenu, EventMultiplexerListener, ::sd::tools::EventMultiple
     }
 }
 
-IMPL_LINK_TYPED(LayoutMenu, WindowEventHandler, VclWindowEvent&, rEvent, void)
+IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent&, rEvent, void)
 {
     switch (rEvent.GetId())
     {
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index 93e5bb082ab9..ef168ed55579 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -187,11 +187,11 @@ private:
 
     /** When clicked then set the current page of the view in the center pane.
     */
-    DECL_LINK_TYPED(ClickHandler, ValueSet*, void);
-    DECL_LINK_TYPED(StateChangeHandler, const OUString&, void);
-    DECL_LINK_TYPED(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void);
-    DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
-    DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
+    DECL_LINK(ClickHandler, ValueSet*, void);
+    DECL_LINK(StateChangeHandler, const OUString&, void);
+    DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void);
+    DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
+    DECL_LINK(OnMenuItemSelected, Menu*, bool);
 };
 
 } } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
index 924a0e64a0ea..8b56bbd9224b 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx
@@ -176,7 +176,7 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority (
     return nPriority;
 }
 
-IMPL_LINK_TYPED(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void)
+IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void)
 {
     bool bIsShowingFullScreenShow (false);
     bool bWaitForMoreRequests (false);
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index 516c3d4f5e01..99d8e4726c23 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -122,7 +122,7 @@ private:
     */
     static sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor);
 
-    DECL_LINK_TYPED(DelayedPreviewCreation, Timer *, void);
+    DECL_LINK(DelayedPreviewCreation, Timer *, void);
 };
 
 } } // end of namespace sd::sidebar
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 2c3c2d3b1bca..52b2153f221f 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -169,7 +169,7 @@ ResId MasterPagesSelector::GetContextMenuResId() const
     return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP);
 }
 
-IMPL_LINK_NOARG_TYPED(MasterPagesSelector, ClickHandler, ValueSet*, void)
+IMPL_LINK_NOARG(MasterPagesSelector, ClickHandler, ValueSet*, void)
 {
     // We use the framework to assign the clicked-on master page because we
     // so use the same mechanism as the context menu does (where we do not
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(MasterPagesSelector, ClickHandler, ValueSet*, void)
     ExecuteCommand(mnDefaultClickAction);
 }
 
-IMPL_LINK_TYPED(MasterPagesSelector, RightClickHandler, const MouseEvent&, rEvent, void)
+IMPL_LINK(MasterPagesSelector, RightClickHandler, const MouseEvent&, rEvent, void)
 {
     // Here we only prepare the display of the context menu: the item under
     // the mouse is selected.  The actual display of the context menu is
@@ -248,7 +248,7 @@ void MasterPagesSelector::ProcessPopupMenu (Menu& rMenu)
         rMenu.EnableItem(SID_TP_SHOW_LARGE_PREVIEW, false);
 }
 
-IMPL_LINK_TYPED(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool)
+IMPL_LINK(MasterPagesSelector, OnMenuItemSelected, Menu*, pMenu, bool)
 {
     if (pMenu == nullptr)
     {
@@ -328,7 +328,7 @@ void MasterPagesSelector::ExecuteCommand (const sal_Int32 nCommandId)
     }
 }
 
-IMPL_LINK_TYPED(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChangeEvent&, rEvent, void)
+IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChangeEvent&, rEvent, void)
 {
     NotifyContainerChangeEvent(rEvent);
 }
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index e89af913771c..f8aa0822a7a7 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -185,10 +185,10 @@ private:
         last seen.  This value is used heuristically to speed up the lookup
         of an index for a token.
     */
-    DECL_LINK_TYPED(ClickHandler, ValueSet*, void);
-    DECL_LINK_TYPED(RightClickHandler, const MouseEvent&, void);
-    DECL_LINK_TYPED(ContainerChangeListener, MasterPageContainerChangeEvent&, void);
-    DECL_LINK_TYPED(OnMenuItemSelected, Menu*, bool);
+    DECL_LINK(ClickHandler, ValueSet*, void);
+    DECL_LINK(RightClickHandler, const MouseEvent&, void);
+    DECL_LINK(ContainerChangeListener, MasterPageContainerChangeEvent&, void);
+    DECL_LINK(OnMenuItemSelected, Menu*, bool);
 
     void SetItem (
         sal_uInt16 nIndex,
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index f9a23f115aab..12d6486b609b 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -86,7 +86,7 @@ void RecentMasterPagesSelector::LateInit()
         LINK(this,RecentMasterPagesSelector,MasterPageListListener));
 }
 
-IMPL_LINK_NOARG_TYPED(RecentMasterPagesSelector, MasterPageListListener, LinkParamNone*, void)
+IMPL_LINK_NOARG(RecentMasterPagesSelector, MasterPageListListener, LinkParamNone*, void)
 {
     MasterPagesSelector::Fill();
 }
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
index 1801242d48c8..44cff1de9e88 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx
@@ -37,7 +37,7 @@ public:
         const css::uno::Reference<css::ui::XSidebar>& rxSidebar);
 
 protected:
-    DECL_LINK_TYPED(MasterPageListListener, LinkParamNone*, void);
+    DECL_LINK(MasterPageListListener, LinkParamNone*, void);
     virtual void Fill (ItemList& rItemList) override;
 
     using sd::sidebar::MasterPagesSelector::Fill;
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 789f5874f53a..1622353915b2 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -278,7 +278,7 @@ void RecentlyUsedMasterPages::SendEvent()
     }
 }
 
-IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageChangeListener,
+IMPL_LINK(RecentlyUsedMasterPages, MasterPageChangeListener,
     MasterPageObserverEvent&, rEvent, void)
 {
     switch (rEvent.meType)
@@ -298,7 +298,7 @@ IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageChangeListener,
     }
 }
 
-IMPL_LINK_TYPED(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
+IMPL_LINK(RecentlyUsedMasterPages, MasterPageContainerChangeListener,
     MasterPageContainerChangeEvent&, rEvent, void)
 {
     switch (rEvent.meEventType)
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index ab0d033b474d..c37f8090c1bd 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -103,8 +103,8 @@ private:
     RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) = delete;
 
     void SendEvent();
-    DECL_LINK_TYPED(MasterPageChangeListener, MasterPageObserverEvent&, void);
-    DECL_LINK_TYPED(MasterPageContainerChangeListener, MasterPageContainerChangeEvent&, void);
+    DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent&, void);
+    DECL_LINK(MasterPageContainerChangeListener, MasterPageContainerChangeEvent&, void);
 
     /** Add a descriptor for the specified master page to the end of the
         list of most recently used master pages.  When the page is already a
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 225849505413..ab7c1fb68fc1 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -348,7 +348,7 @@ void SlideBackground::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-IMPL_LINK_TYPED(SlideBackground, EventMultiplexerListener,
+IMPL_LINK(SlideBackground, EventMultiplexerListener,
                 tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
@@ -769,7 +769,7 @@ void SlideBackground::NotifyItemUpdate(
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void)
+IMPL_LINK_NOARG(SlideBackground, FillStyleModifyHdl, ListBox&, void)
 {
     const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectEntryPos();
     Update();
@@ -818,7 +818,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillStyleModifyHdl, ListBox&, void)
     mpFillStyle->Selected();
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
+IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
 {
     Paper ePaper =  mpPaperSizeBox->GetSelection();
     Size  aSize(SvxPaperInfo::GetPaperSize(ePaper, (MapUnit)(meUnit)));
@@ -831,7 +831,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, PaperSizeModifyHdl, ListBox&, void)
     GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() });
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, FillColorHdl, ListBox&, void)
+IMPL_LINK_NOARG(SlideBackground, FillColorHdl, ListBox&, void)
 {
     const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos();
     switch(eXFS)
@@ -857,7 +857,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillColorHdl, ListBox&, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, FillBackgroundHdl, ListBox&, void)
+IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void)
 {
     const eFillStyle nFillPos = (eFillStyle)mpFillStyle->GetSelectEntryPos();
     SfxObjectShell* pSh = SfxObjectShell::Current();
@@ -904,7 +904,7 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, FillBackgroundHdl, ListBox&, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, AssignMasterPage, ListBox&, void)
+IMPL_LINK_NOARG(SlideBackground, AssignMasterPage, ListBox&, void)
 {
     ::sd::DrawDocShell* pDocSh = dynamic_cast<::sd::DrawDocShell*>( SfxObjectShell::Current() );
     SdDrawDocument* pDoc = pDocSh ? pDocSh->GetDoc() : nullptr;
@@ -923,19 +923,19 @@ IMPL_LINK_NOARG_TYPED(SlideBackground, AssignMasterPage, ListBox&, void)
     pDoc->SetMasterPage(nSelectedPage, aLayoutName, pDoc, false, false);
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, CloseMasterHdl, Button*, void)
+IMPL_LINK_NOARG(SlideBackground, CloseMasterHdl, Button*, void)
 {
     GetBindings()->GetDispatcher()->Execute( SID_CLOSE_MASTER_VIEW, SfxCallMode::RECORD );
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, DspBackground, Button*, void)
+IMPL_LINK_NOARG(SlideBackground, DspBackground, Button*, void)
 {
     bool IsChecked = mpDspMasterBackground->IsChecked();
     const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_BACKGROUND, IsChecked);
     GetBindings()->GetDispatcher()->ExecuteList(SID_DISPLAY_MASTER_BACKGROUND, SfxCallMode::RECORD, { &aBoolItem });
 }
 
-IMPL_LINK_NOARG_TYPED(SlideBackground, DspObjects, Button*, void)
+IMPL_LINK_NOARG(SlideBackground, DspObjects, Button*, void)
 {
     bool IsChecked = mpDspMasterObjects->IsChecked();
     const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_OBJECTS,IsChecked);
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index ed41aa08004d..deb9a3b8118a 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -117,15 +117,15 @@ private:
 
     MapUnit meUnit;
 
-    DECL_LINK_TYPED(FillBackgroundHdl, ListBox&, void);
-    DECL_LINK_TYPED(FillStyleModifyHdl, ListBox&, void);
-    DECL_LINK_TYPED(PaperSizeModifyHdl, ListBox&, void);
-    DECL_LINK_TYPED(FillColorHdl, ListBox&, void);
-    DECL_LINK_TYPED(AssignMasterPage, ListBox&, void);
-    DECL_LINK_TYPED(DspBackground, Button*, void);
-    DECL_LINK_TYPED(DspObjects, Button*, void);
-    DECL_LINK_TYPED(CloseMasterHdl, Button*, void);
-    DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
+    DECL_LINK(FillBackgroundHdl, ListBox&, void);
+    DECL_LINK(FillStyleModifyHdl, ListBox&, void);
+    DECL_LINK(PaperSizeModifyHdl, ListBox&, void);
+    DECL_LINK(FillColorHdl, ListBox&, void);
+    DECL_LINK(AssignMasterPage, ListBox&, void);
+    DECL_LINK(DspBackground, Button*, void);
+    DECL_LINK(DspObjects, Button*, void);
+    DECL_LINK(CloseMasterHdl, Button*, void);
+    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
 
     void Initialize();
     void Update();
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 4db7f62e7d57..2eec9f302522 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -77,7 +77,7 @@ void SlideShowRestarter::Restart (bool bForce)
         LINK(this, SlideShowRestarter, EndPresentation));
 }
 
-IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void)
+IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation, void*, void)
 {
     mnEventId = nullptr;
     if (mpSlideShow.is())
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 46a8563efea9..f25c9fcb98af 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -69,7 +69,7 @@ private:
     SfxDispatcher* mpDispatcher;
     sal_Int32 mnCurrentSlideNumber;
 
-    DECL_LINK_TYPED(EndPresentation, void*, void);
+    DECL_LINK(EndPresentation, void*, void);
 
     /** Restart the presentation on the slide last shown before the restart
         was initiated.
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 8b8f8c313167..ba757dc4b0a8 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -548,7 +548,7 @@ void ShowWindow::DrawEndScene()
     SetFont( aOldFont );
 }
 
-IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void )
+IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void )
 {
     if( !( --mnPauseTimeout ) )
         RestartShow();
@@ -559,7 +559,7 @@ IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void)
+IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl, Timer *, void)
 {
     if( mbMouseCursorHidden )
     {
@@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void)
     }
 }
 
-IMPL_LINK_TYPED( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void )
+IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void )
 {
     if( mbMouseAutoHide )
     {
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index 97c03da90271..229332e6a3c6 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -105,9 +105,9 @@ private:
     bool            mbMouseCursorHidden;
     sal_uInt64      mnFirstMouseMove;
 
-                    DECL_LINK_TYPED( PauseTimeoutHdl, Timer*, void );
-                    DECL_LINK_TYPED(MouseTimeoutHdl, Timer *, void);
-                    DECL_LINK_TYPED( EventHdl, VclWindowEvent&, void );
+                    DECL_LINK( PauseTimeoutHdl, Timer*, void );
+                    DECL_LINK(MouseTimeoutHdl, Timer *, void);
+                    DECL_LINK( EventHdl, VclWindowEvent&, void );
 
     ::rtl::Reference< SlideshowImpl > mxController;
 };
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 7330d79b4fd7..700129f491a3 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1028,7 +1028,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback()
     mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) );
 }
 
-IMPL_LINK_NOARG_TYPED(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void)
+IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl, void*, void)
 {
     mnInPlaceConfigEvent = nullptr;
     StartInPlacePresentation();
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index c9f0adb6cc93..ebcb61eee36e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1385,7 +1385,7 @@ void SlideshowImpl::endPresentation()
         mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) );
 }
 
-IMPL_LINK_NOARG_TYPED(SlideshowImpl, endPresentationHdl, void*, void)
+IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl, void*, void)
 {
     mnEndShowEvent = nullptr;
 
@@ -1692,7 +1692,7 @@ void SlideshowImpl::startUpdateTimer()
     This is used to unfreeze user input that was disabled after
     slide change to skip input that was buffered during slide
     transition preparation */
-IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void)
+IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl, Timer *, void)
 {
     mbInputFreeze = false;
 }
@@ -1701,7 +1701,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void)
     and not by using the timer, I will personally punish this
     person seriously, even if this person is me.
 */
-IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void)
+IMPL_LINK_NOARG(SlideshowImpl, updateHdl, Timer *, void)
 {
     updateSlideShow();
 }
@@ -1888,7 +1888,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
     return bRet;
 }
 
-IMPL_LINK_TYPED( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void )
+IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void )
 {
     if( !mxShow.is() || mbInputFreeze )
         return;
@@ -1974,7 +1974,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void)
+IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void)
 {
     mnContextMenuEvent = nullptr;
 
@@ -2107,7 +2107,7 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, ContextMenuHdl, void*, void)
         resume();
 }
 
-IMPL_LINK_TYPED( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu, bool )
 {
     if( pMenu )
     {
@@ -2549,7 +2549,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio
     }
 }
 
-IMPL_LINK_NOARG_TYPED(SlideshowImpl, deactivateHdl, Timer *, void)
+IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl, Timer *, void)
 {
     if( mbActive && mxShow.is() )
     {
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index f990f8d96e7e..3234f9ad724f 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -273,13 +273,13 @@ private:
 
     void setActiveXToolbarsVisible( bool bVisible );
 
-    DECL_LINK_TYPED( updateHdl, Timer *, void );
-    DECL_LINK_TYPED( ReadyForNextInputHdl, Timer *, void );
-    DECL_LINK_TYPED( endPresentationHdl, void*, void );
-    DECL_LINK_TYPED( ContextMenuSelectHdl, Menu *, bool );
-    DECL_LINK_TYPED( ContextMenuHdl, void*, void );
-    DECL_LINK_TYPED( deactivateHdl, Timer *, void );
-    DECL_LINK_TYPED( EventListenerHdl, VclSimpleEvent&, void );
+    DECL_LINK( updateHdl, Timer *, void );
+    DECL_LINK( ReadyForNextInputHdl, Timer *, void );
+    DECL_LINK( endPresentationHdl, void*, void );
+    DECL_LINK( ContextMenuSelectHdl, Menu *, bool );
+    DECL_LINK( ContextMenuHdl, void*, void );
+    DECL_LINK( deactivateHdl, Timer *, void );
+    DECL_LINK( EventListenerHdl, VclSimpleEvent&, void );
 
     /** called only by the slideshow view when the first paint event occurs.
         This actually starts the slideshow. */
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
index d2e4b651ce9f..694da4fc5b62 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx
@@ -132,7 +132,7 @@ CacheCompactor::CacheCompactor(
 
 }
 
-IMPL_LINK_NOARG_TYPED(CacheCompactor, CompactionCallback, Timer *, void)
+IMPL_LINK_NOARG(CacheCompactor, CompactionCallback, Timer *, void)
 {
     mbIsCompactionRunning = true;
 
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
index 783afecba1a0..4da9ca05f92d 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx
@@ -80,7 +80,7 @@ private:
     */
     Timer maCompactionTimer;
     bool mbIsCompactionRunning;
-    DECL_LINK_TYPED(CompactionCallback, Timer *, void);
+    DECL_LINK(CompactionCallback, Timer *, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::cache
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
index 3f7207d754cd..31a8a52b64d5 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx
@@ -135,7 +135,7 @@ Any CacheConfiguration::GetValue (const OUString& rName)
     return aResult;
 }
 
-IMPL_STATIC_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void)
+IMPL_STATIC_LINK_NOARG(CacheConfiguration, TimerCallback, Timer *, void)
 {
     CacheConfigSharedPtr &rInstancePtr = theInstance::get();
     // Release our reference to the instance.
diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
index 27ff28ef01d3..74a8097f02db 100644
--- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx
@@ -55,7 +55,7 @@ private:
 
     CacheConfiguration();
 
-    DECL_STATIC_LINK_TYPED(CacheConfiguration, TimerCallback, Timer *, void);
+    DECL_STATIC_LINK(CacheConfiguration, TimerCallback, Timer *, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::cache
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
index cf291038a7a0..67ab7e2f82f9 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
@@ -106,7 +106,7 @@ void QueueProcessor::SetPreviewSize (
     mbDoSuperSampling = bDoSuperSampling;
 }
 
-IMPL_LINK_NOARG_TYPED(QueueProcessor, ProcessRequestHdl, Timer *, void)
+IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl, Timer *, void)
 {
     ProcessRequests();
 }
diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
index c5c15808656a..73779abb0a22 100644
--- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
@@ -92,7 +92,7 @@ private:
     ::osl::Mutex maMutex;
 
     Timer  maTimer;
-    DECL_LINK_TYPED(ProcessRequestHdl, Timer *, void);
+    DECL_LINK(ProcessRequestHdl, Timer *, void);
     sal_uInt32 mnTimeBetweenHighPriorityRequests;
     sal_uInt32 mnTimeBetweenLowPriorityRequests;
     sal_uInt32 mnTimeBetweenRequestsWhenNotIdle;
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 7f46fa296119..b762a68cd172 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -517,14 +517,14 @@ void SlideSorterController::HandleModelChange()
     }
 }
 
-IMPL_LINK_TYPED(SlideSorterController, ApplicationEventHandler, VclSimpleEvent&, rEvent, void)
+IMPL_LINK(SlideSorterController, ApplicationEventHandler, VclSimpleEvent&, rEvent, void)
 {
     auto windowEvent = dynamic_cast<VclWindowEvent *>(&rEvent);
     if (windowEvent != nullptr) {
         WindowEventHandler(*windowEvent);
     }
 }
-IMPL_LINK_TYPED(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, void)
+IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, void)
 {
         vcl::Window* pWindow = rEvent.GetWindow();
         sd::Window *pActiveWindow (mrSlideSorter.GetContentWindow());
diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
index 12af47a320cb..f0fd68890d0f 100644
--- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx
@@ -211,7 +211,7 @@ void Animator::RequestNextFrame ()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(Animator, TimeoutHandler, Idle *, void)
+IMPL_LINK_NOARG(Animator, TimeoutHandler, Idle *, void)
 {
     if (mbIsDisposed)
         return;
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 6928baa682de..a926f04434d8 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -578,7 +578,7 @@ void Clipboard::DragFinished (sal_Int8 nDropAction)
     }
 }
 
-IMPL_LINK_TYPED(Clipboard, ProcessDragFinished, void*, pUserData, void)
+IMPL_LINK(Clipboard, ProcessDragFinished, void*, pUserData, void)
 {
     const sal_Int8 nDropAction (static_cast<sal_Int8>(reinterpret_cast<sal_IntPtr>(pUserData)));
 
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index da5e6e086fd7..ca8144484356 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -236,7 +236,7 @@ void CurrentSlideManager::HandleModelChange()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(CurrentSlideManager, SwitchPageCallback, Timer *, void)
+IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback, Timer *, void)
 {
     if (mpCurrentSlide)
     {
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index c85ea076aa60..03206dc3d715 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -344,7 +344,7 @@ void Listener::Notify (
     }
 }
 
-IMPL_LINK_TYPED(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx
index 7776248f59db..c57b6336a79a 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx
@@ -176,7 +176,7 @@ private:
     void ThrowIfDisposed()
         throw (css::lang::DisposedException);
 
-    DECL_LINK_TYPED(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent&, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index b3cf776755f1..171b61226b75 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -238,7 +238,7 @@ void ScrollBarManager::UpdateScrollBars(bool bUseScrolling)
     }
 }
 
-IMPL_LINK_TYPED(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar, void)
+IMPL_LINK(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollBar, void)
 {
     if (pScrollBar!=nullptr
         && pScrollBar==mpVerticalScrollBar.get()
@@ -253,7 +253,7 @@ IMPL_LINK_TYPED(ScrollBarManager, VerticalScrollBarHandler, ScrollBar*, pScrollB
     }
 }
 
-IMPL_LINK_TYPED(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar, void)
+IMPL_LINK(ScrollBarManager, HorizontalScrollBarHandler, ScrollBar*, pScrollBar, void)
 {
     if (pScrollBar!=nullptr
         && pScrollBar==mpHorizontalScrollBar.get()
@@ -533,7 +533,7 @@ void ScrollBarManager::clearAutoScrollFunctor()
     maAutoScrollFunctor = ::std::function<void ()>();
 }
 
-IMPL_LINK_NOARG_TYPED(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, void)
+IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, void)
 {
     RepeatAutoScroll();
 }
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 7d25663460b5..b297daad4693 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -913,7 +913,7 @@ void SlotManager::RenameSlide()
     }
 }
 
-IMPL_LINK_TYPED(SlotManager, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool)
+IMPL_LINK(SlotManager, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool)
 {
     OUString aNewName;
     rDialog.GetName( aNewName );
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 766058f923c8..58d22cf727e9 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -160,8 +160,8 @@ public:
     */
     void HandleModelChange();
 
-    DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
-    DECL_LINK_TYPED(ApplicationEventHandler, VclSimpleEvent&, void);
+    DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
+    DECL_LINK(ApplicationEventHandler, VclSimpleEvent&, void);
 
     /** Update the display of all pages.  This involves a redraw and
         releasing previews and caches.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index 70041b4ac43a..ff127eace895 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -100,7 +100,7 @@ private:
 
     AnimationId mnNextAnimationId;
 
-    DECL_LINK_TYPED(TimeoutHandler, Idle *, void);
+    DECL_LINK(TimeoutHandler, Idle *, void);
 
     /** Execute one step of every active animation.
         @param nTime
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 6ec289447414..2a5aceed4cee 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -226,7 +226,7 @@ private:
     /** Asynchronous part of DragFinished.  The argument is the sal_Int8
         nDropAction, disguised as void*.
     */
-    DECL_LINK_TYPED(ProcessDragFinished, void*, void);
+    DECL_LINK(ProcessDragFinished, void*, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index 803918705b88..571374d98d93 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -107,7 +107,7 @@ private:
     */
     void AcquireCurrentSlide (const sal_Int32 nSlideIndex);
 
-    DECL_LINK_TYPED(SwitchPageCallback, Timer*, void);
+    DECL_LINK(SwitchPageCallback, Timer*, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::controller
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 44aab4d5af37..698ab95702ba 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -238,9 +238,9 @@ private:
     void CalcAutoScrollOffset (const Point& rMouseWindowPosition);
     bool RepeatAutoScroll();
 
-    DECL_LINK_TYPED(HorizontalScrollBarHandler, ScrollBar*, void);
-    DECL_LINK_TYPED(VerticalScrollBarHandler, ScrollBar*, void);
-    DECL_LINK_TYPED(AutoScrollTimeoutHandler, Timer *, void);
+    DECL_LINK(HorizontalScrollBarHandler, ScrollBar*, void);
+    DECL_LINK(VerticalScrollBarHandler, ScrollBar*, void);
+    DECL_LINK(AutoScrollTimeoutHandler, Timer *, void);
 
     void PlaceHorizontalScrollBar (const Rectangle& aArea);
     void PlaceVerticalScrollBar (const Rectangle& aArea);
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
index e6aed91ccb48..0f74f23fed20 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx
@@ -86,7 +86,7 @@ private:
         drviews2.cxx.
     */
     void RenameSlide();
-    DECL_LINK_TYPED(RenameSlideHdl, AbstractSvxNameDialog&, bool);
+    DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog&, bool);
     bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName);
 
     /** Handle SID_INSERTPAGE slot calls.
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
index de1086c2755b..d49481a679db 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
@@ -68,7 +68,7 @@ private:
     void Show (const bool bForce);
     void DoShow();
 
-    DECL_LINK_TYPED(DelayTrigger, Timer*, void);
+    DECL_LINK(DelayTrigger, Timer*, void);
 };
 
 } } } // end of namespace ::sd::slidesorter::view
diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
index 64f7dd0836d8..1c86c933bde4 100644
--- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx
+++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx
@@ -155,7 +155,7 @@ bool ToolTip::Hide()
         return false;
 }
 
-IMPL_LINK_NOARG_TYPED(ToolTip, DelayTrigger, Timer *, void)
+IMPL_LINK_NOARG(ToolTip, DelayTrigger, Timer *, void)
 {
     DoShow();
 }
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index c78d4d325543..9233453be888 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -156,7 +156,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
         return nullptr;
 }
 
-IMPL_LINK_NOARG_TYPED(TableDesignWidget, implValueSetHdl, ValueSet*, void)
+IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void)
 {
     mbStyleSelected = true;
     if( !mbModal )
@@ -213,7 +213,7 @@ void TableDesignWidget::ApplyStyle()
     }
 }
 
-IMPL_LINK_NOARG_TYPED(TableDesignWidget, implCheckBoxHdl, Button*, void)
+IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void)
 {
     mbOptionsChanged = true;
 
@@ -437,7 +437,7 @@ void TableDesignWidget::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-IMPL_LINK_TYPED(TableDesignWidget,EventMultiplexerListener,
+IMPL_LINK(TableDesignWidget,EventMultiplexerListener,
     tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
diff --git a/sd/source/ui/table/TableDesignPane.hxx b/sd/source/ui/table/TableDesignPane.hxx
index 13b45af85b12..90dc69fba976 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -85,9 +85,9 @@ private:
 
     void FillDesignPreviewControl();
 
-    DECL_LINK_TYPED(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
-    DECL_LINK_TYPED(implValueSetHdl, ValueSet*, void);
-    DECL_LINK_TYPED(implCheckBoxHdl, Button*, void);
+    DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
+    DECL_LINK(implValueSetHdl, ValueSet*, void);
+    DECL_LINK(implCheckBoxHdl, Button*, void);
 
 private:
     ViewShellBase& mrBase;
diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx
index 47ba8bb5aed8..7208db4f2129 100644
--- a/sd/source/ui/tools/AsynchronousCall.cxx
+++ b/sd/source/ui/tools/AsynchronousCall.cxx
@@ -44,7 +44,7 @@ void AsynchronousCall::Post (const AsynchronousFunction& rFunction)
     maTimer.Start();
 }
 
-IMPL_LINK_TYPED(AsynchronousCall,TimerCallback,Timer*,pTimer,void)
+IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer,void)
 {
     if (pTimer == &maTimer)
     {
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx
index a208144a93ee..d51d5b9e0c0f 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -148,7 +148,7 @@ private:
     void ThrowIfDisposed()
         throw (css::lang::DisposedException);
 
-    DECL_LINK_TYPED(SlideSorterSelectionChangeListener, LinkParamNone*, void);
+    DECL_LINK(SlideSorterSelectionChangeListener, LinkParamNone*, void);
 };
 
 const char aCurrentPagePropertyName[] = "CurrentPage";
@@ -694,7 +694,7 @@ void EventMultiplexer::Implementation::CallListeners (EventMultiplexerEvent& rEv
     }
 }
 
-IMPL_LINK_NOARG_TYPED(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener, LinkParamNone*, void)
+IMPL_LINK_NOARG(EventMultiplexer::Implementation, SlideSorterSelectionChangeListener, LinkParamNone*, void)
 {
     CallListeners(EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION);
 }
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index bafd904290a2..8d99a259a7e3 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -106,7 +106,7 @@ void TimerBasedTaskExecution::SetSelf (
         mpSelf = rpSelf;
 }
 
-IMPL_LINK_NOARG_TYPED(TimerBasedTaskExecution, TimerCallback, Timer *, void)
+IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback, Timer *, void)
 {
     if (mpTask.get() != nullptr)
     {
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index 62c69b622095..613d8b2562fd 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -183,7 +183,7 @@ void FormShellManager::UnregisterAtCenterPane()
     mpSubShellFactory.reset();
 }
 
-IMPL_LINK_NOARG_TYPED(FormShellManager, FormControlActivated, LinkParamNone*, void)
+IMPL_LINK_NOARG(FormShellManager, FormControlActivated, LinkParamNone*, void)
 {
     // The form shell has been activated.  To give it priority in reacting to
     // slot calls the form shell is moved to the top of the object bar shell
@@ -198,7 +198,7 @@ IMPL_LINK_NOARG_TYPED(FormShellManager, FormControlActivated, LinkParamNone*, vo
     }
 }
 
-IMPL_LINK_TYPED(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
@@ -223,7 +223,7 @@ IMPL_LINK_TYPED(FormShellManager, ConfigurationUpdateHandler, sd::tools::EventMu
     }
 }
 
-IMPL_LINK_TYPED(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void)
+IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void)
 {
     switch (rEvent.GetId())
     {
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index 1b05892fb2f6..a0b2e4370970 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -323,9 +323,9 @@ private:
     static OUString GetToolBarResourceName (const OUString& rsBaseName);
     bool CheckPlugInMode (const OUString& rsName) const;
 
-    DECL_LINK_TYPED(UpdateCallback, void *, void);
-    DECL_LINK_TYPED(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent&, void);
-    DECL_LINK_TYPED(SetValidCallback, void*, void);
+    DECL_LINK(UpdateCallback, void *, void);
+    DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent&, void);
+    DECL_LINK(SetValidCallback, void*, void);
 };
 
 //===== ToolBarManager ========================================================
@@ -847,7 +847,7 @@ void ToolBarManager::Implementation::Update (
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, UpdateCallback, void*, void)
+IMPL_LINK_NOARG(ToolBarManager::Implementation, UpdateCallback, void*, void)
 {
     mnPendingUpdateCall = nullptr;
     if (mnLockCount == 0)
@@ -861,7 +861,7 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, UpdateCallback, void*, voi
     }
 }
 
-IMPL_LINK_TYPED(ToolBarManager::Implementation,EventMultiplexerCallback,
+IMPL_LINK(ToolBarManager::Implementation,EventMultiplexerCallback,
     sd::tools::EventMultiplexerEvent&, rEvent, void)
 {
     SolarMutexGuard g;
@@ -883,7 +883,7 @@ IMPL_LINK_TYPED(ToolBarManager::Implementation,EventMultiplexerCallback,
     }
 }
 
-IMPL_LINK_NOARG_TYPED(ToolBarManager::Implementation, SetValidCallback, void*, void)
+IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback, void*, void)
 {
     mnPendingSetValidCall = nullptr;
     SetValid(true);
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 3c2e87c591c2..edb4a730b2a5 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -348,7 +348,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock (
     maTimer.Start();
 }
 
-IMPL_LINK_NOARG_TYPED(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback, Timer *, void)
+IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback, Timer *, void)
 {
     // If possible then release the lock now.  Otherwise start the timer
     // and try again later.
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 66a589cdcd68..a95e27d872a8 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -204,7 +204,7 @@ private:
     */
     void CreateTargetStack (ShellStack& rStack) const;
 
-    DECL_LINK_TYPED(WindowEventHandler, VclWindowEvent&, void);
+    DECL_LINK(WindowEventHandler, VclWindowEvent&, void);
 
 #if OSL_DEBUG_LEVEL >= 2
     void DumpShellStack (const ShellStack& rStack);
@@ -982,7 +982,7 @@ void ViewShellManager::Implementation::CreateTargetStack (ShellStack& rStack) co
     }
 }
 
-IMPL_LINK_TYPED(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, rEvent, void)
+IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, rEvent, void)
 {
         vcl::Window* pEventWindow = rEvent.GetWindow();
 
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index f1e46bc66097..56897272a816 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -613,7 +613,7 @@ void DrawViewShell::SetUIUnit(FieldUnit eUnit)
  * Refresh TabControl on splitter change
  */
 
-IMPL_LINK_TYPED( DrawViewShell, TabSplitHdl, TabBar *, pTab, void )
+IMPL_LINK( DrawViewShell, TabSplitHdl, TabBar *, pTab, void )
 {
     const long int nMax = maViewSize.Width() - maScrBarWH.Width()
         - maTabControl->GetPosPixel().X() ;
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index c821eef43d40..be17178b3b43 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -185,7 +185,7 @@ using namespace ::com::sun::star::linguistic2;
 
 namespace sd {
 
-IMPL_LINK_TYPED( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void )
+IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void )
 {
     mbPastePossible = ( pDataHelper->GetFormatCount() != 0 );
 
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 3369ee40ca55..0c4c7f05d05a 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -138,7 +138,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName  )
     return bSuccess;
 }
 
-IMPL_LINK_TYPED( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool )
+IMPL_LINK( DrawViewShell, RenameSlideHdl, AbstractSvxNameDialog&, rDialog, bool )
 {
     OUString aNewName;
     rDialog.GetName( aNewName );
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 320992494893..3bbb3a7ef9ce 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -83,7 +83,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
     }
 }
 
-IMPL_LINK_TYPED( DrawViewShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool )
+IMPL_LINK( DrawViewShell, NameObjectHdl, AbstractSvxObjectNameDialog&, rDialog, bool )
 {
     OUString aName;
     rDialog.GetName( aName );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 093649972c3a..349a70ccffd5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -702,7 +702,7 @@ void OutlineViewShell::FuPermanent(SfxRequest &rReq)
     }
 }
 
-IMPL_LINK_TYPED( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void )
+IMPL_LINK( OutlineViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper, void )
 {
     bPastePossible = pDataHelper->GetFormatCount() != 0 &&
                      ( pDataHelper->HasFormat( SotClipboardFormatId::STRING ) ||
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 91931c1db4ff..f9a5c5f5dc39 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -358,7 +358,7 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara)
 /**
  * Handler for inserting pages (paragraphs)
  */
-IMPL_LINK_TYPED( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner, void )
 {
     // we get calls to this handler during binary insert of drag and drop contents but
     // we ignore it here and handle it later in OnEndPasteOrDrop()
@@ -498,7 +498,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
 /**
  * Handler for deleting pages (paragraphs)
  */
-IMPL_LINK_TYPED( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner, void )
 {
     DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::ParagraphRemovingHdl(), model change without undo?!" );
 
@@ -555,7 +555,7 @@ IMPL_LINK_TYPED( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner, voi
  * Handler for changing the indentation depth of paragraphs (requires inserting
  * or deleting of pages in some cases)
  */
-IMPL_LINK_TYPED( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void )
 {
     DBG_ASSERT( isRecordingUndo(), "sd::OutlineView::DepthChangedHdl(), no undo for model change?!" );
 
@@ -769,7 +769,7 @@ IMPL_LINK_TYPED( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner, void )
 /**
  * Handler for StatusEvents
  */
-IMPL_LINK_NOARG_TYPED(OutlineView, StatusEventHdl, EditStatus&, void)
+IMPL_LINK_NOARG(OutlineView, StatusEventHdl, EditStatus&, void)
 {
     ::sd::Window*   pWin = mrOutlineViewShell.GetActiveWindow();
     OutlinerView*   pOutlinerView = GetViewByWindow(pWin);
@@ -791,14 +791,14 @@ IMPL_LINK_NOARG_TYPED(OutlineView, StatusEventHdl, EditStatus&, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(OutlineView, BeginDropHdl, EditView*, void)
+IMPL_LINK_NOARG(OutlineView, BeginDropHdl, EditView*, void)
 {
     DBG_ASSERT(maDragAndDropModelGuard.get() == nullptr, "sd::OutlineView::BeginDropHdl(), prior drag operation not finished correctly!" );
 
     maDragAndDropModelGuard.reset( new OutlineViewModelChangeGuard( *this ) );
 }
 
-IMPL_LINK_NOARG_TYPED(OutlineView, EndDropHdl, EditView*, void)
+IMPL_LINK_NOARG(OutlineView, EndDropHdl, EditView*, void)
 {
     maDragAndDropModelGuard.reset(nullptr);
 }
@@ -806,7 +806,7 @@ IMPL_LINK_NOARG_TYPED(OutlineView, EndDropHdl, EditView*, void)
 /**
  * Handler for the start of a paragraph movement
  */
-IMPL_LINK_TYPED( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner, void )
 {
     OutlineViewPageChangesGuard aGuard(this);
 
@@ -847,7 +847,7 @@ IMPL_LINK_TYPED( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner, void )
 /**
  * Handler for the end of a paragraph movement
  */
-IMPL_LINK_TYPED( OutlineView, EndMovingHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner, void )
 {
     OutlineViewPageChangesGuard aGuard(this);
 
@@ -1161,7 +1161,7 @@ void OutlineView::FillOutliner()
 /**
  * Handler for deleting of level 0 paragraphs (pages): Warning
  */
-IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool)
+IMPL_LINK_NOARG(OutlineView, RemovingPagesHdl, OutlinerView*, bool)
 {
     sal_Int32 nNumOfPages = mrOutliner.GetSelPageCount();
 
@@ -1184,7 +1184,7 @@ IMPL_LINK_NOARG_TYPED(OutlineView, RemovingPagesHdl, OutlinerView*, bool)
 /**
  * Handler for indenting level 0 paragraphs (pages): Warning
  */
-IMPL_LINK_TYPED( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView, bool )
+IMPL_LINK( OutlineView, IndentingPagesHdl, OutlinerView *, pOutlinerView, bool )
 {
     return RemovingPagesHdl(pOutlinerView);
 }
@@ -1418,12 +1418,12 @@ void OutlineView::onUpdateStyleSettings( bool bForceUpdate /* = false */ )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(OutlineView, AppEventListenerHdl, VclSimpleEvent&, void)
+IMPL_LINK_NOARG(OutlineView, AppEventListenerHdl, VclSimpleEvent&, void)
 {
     onUpdateStyleSettings(false);
 }
 
-IMPL_LINK_TYPED(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void)
+IMPL_LINK(OutlineView, EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
     {
@@ -1592,7 +1592,7 @@ void OutlineView::TryToMergeUndoActions()
     }
 }
 
-IMPL_LINK_TYPED(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo, void)
+IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo, void)
 {
     if( !pInfo )
         return;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index ebb545b3c1c5..061b28aecb2e 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -1083,7 +1083,7 @@ void View::onAccessibilityOptionsChanged()
     }
 }
 
-IMPL_LINK_TYPED( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void )
 {
     Paragraph* pPara = pOutliner->GetHdlParagraph();
     SdrObject* pObj = GetTextEditObject();
@@ -1099,7 +1099,7 @@ IMPL_LINK_TYPED( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void )
 /**
  * Handler for the deletion of the pages (paragraphs).
  */
-IMPL_LINK_TYPED( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner, void )
+IMPL_LINK( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner, void )
 {
     Paragraph* pPara = pOutliner->GetHdlParagraph();
     SdrObject* pObj = GetTextEditObject();
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 8c178c2dec9a..b5670998f0b4 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -799,7 +799,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt,
     return nRet;
 }
 
-IMPL_LINK_TYPED( View, ExecuteNavigatorDrop, void*, p, void )
+IMPL_LINK( View, ExecuteNavigatorDrop, void*, p, void )
 {
     SdNavigatorDropEvent*                   pSdNavigatorDropEvent = static_cast<SdNavigatorDropEvent*>(p);
     TransferableDataHelper                  aDataHelper( pSdNavigatorDropEvent->maDropEvent.Transferable );
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index d9147c711cd8..6ad4b1d7901c 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -391,7 +391,7 @@ SdrMediaObj* View::InsertMediaObj( const OUString& rMediaURL, const OUString& rM
 /**
  * Timer handler for InsertFile at Drop()
  */
-IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void)
+IMPL_LINK_NOARG(View, DropInsertFileHdl, Idle *, void)
 {
     DBG_ASSERT( mpViewSh, "sd::View::DropInsertFileHdl(), I need a view shell to work!" );
     if( !mpViewSh )
@@ -582,7 +582,7 @@ IMPL_LINK_NOARG_TYPED(View, DropInsertFileHdl, Idle *, void)
 /**
  * Timer handler for Errorhandling at Drop()
  */
-IMPL_LINK_NOARG_TYPED(View, DropErrorHdl, Idle *, void)
+IMPL_LINK_NOARG(View, DropErrorHdl, Idle *, void)
 {
     ScopedVclPtrInstance<InfoBox>( mpViewSh ? mpViewSh->GetActiveWindow() : nullptr, SD_RESSTR(STR_ACTION_NOTPOSSIBLE) )->Execute();
 }
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 86f87872af04..14d6bfff8ae9 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -444,7 +444,7 @@ void ViewOverlayManager::UpdateTags()
         mnUpdateTagsEvent = Application::PostUserEvent( LINK( this, ViewOverlayManager, UpdateTagsHdl ) );
 }
 
-IMPL_LINK_NOARG_TYPED(ViewOverlayManager, UpdateTagsHdl, void*, void)
+IMPL_LINK_NOARG(ViewOverlayManager, UpdateTagsHdl, void*, void)
 {
     OSL_TRACE("ViewOverlayManager::UpdateTagsHdl");
 
@@ -501,7 +501,7 @@ bool ViewOverlayManager::DisposeTags()
     return false;
 }
 
-IMPL_LINK_TYPED(ViewOverlayManager,EventMultiplexerListener,
+IMPL_LINK(ViewOverlayManager,EventMultiplexerListener,
     tools::EventMultiplexerEvent&, rEvent, void)
 {
     switch (rEvent.meEventId)
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 917daa212afa..3e30e82fb2bf 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -134,7 +134,7 @@ void ViewShell::UpdateScrollBars()
 /**
  * Handling for horizontal Scrollbars
  */
-IMPL_LINK_TYPED(ViewShell, HScrollHdl, ScrollBar *, pHScroll, void )
+IMPL_LINK(ViewShell, HScrollHdl, ScrollBar *, pHScroll, void )
 {
     VirtHScrollHdl(pHScroll);
 }
@@ -188,7 +188,7 @@ void ViewShell::VirtHScrollHdl(ScrollBar* pHScroll)
 /**
  * handling for vertical Scrollbars
  */
-IMPL_LINK_TYPED(ViewShell, VScrollHdl, ScrollBar *, pVScroll, void )
+IMPL_LINK(ViewShell, VScrollHdl, ScrollBar *, pVScroll, void )
 {
     VirtVScrollHdl(pVScroll);
 }