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

44 files changed, 143 insertions, 143 deletions

diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx
index 7f1c1fc52a78..6dfa031bbce6 100644
--- a/include/svx/SvxPresetListBox.hxx
+++ b/include/svx/SvxPresetListBox.hxx
@@ -35,7 +35,7 @@ private:
     Link<SvxPresetListBox*,void> maRenameHdl;
     Link<SvxPresetListBox*,void> maDeleteHdl;
 
-    DECL_LINK_TYPED( OnMenuItemSelected, Menu*, bool );
+    DECL_LINK( OnMenuItemSelected, Menu*, bool );
 
     template< typename ListType, typename EntryType >
     void FillPresetListBoxImpl(ListType& pList, sal_uInt32 nStartIndex);
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index e94dc5d2d9a8..011c2ec0bd7e 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -121,7 +121,7 @@ private:
     void            InitSettings(vcl::RenderContext& rRenderContext);
     // abstraction layers are: Unicode<->MapIndex<->Pixel
     Point           MapIndexToPixel( int) const;
-    DECL_LINK_TYPED(VscrollHdl, ScrollBar*, void);
+    DECL_LINK(VscrollHdl, ScrollBar*, void);
 
     void            init();
     Rectangle       getGridRectangle(const Point &rPointUL, const Size &rOutputSize);
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index b212162feab0..aef95d3e31a3 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -56,7 +56,7 @@ protected:
     // DragSourceHelper
     virtual void    StartDrag( sal_Int8 nAction, const Point& rPtPixel ) override;
 
-                    DECL_LINK_TYPED(ExecDragHdl, void*, void);
+                    DECL_LINK(ExecDragHdl, void*, void);
 
 public:
     SvxColorValueSet_docking( vcl::Window* pParent );
@@ -86,7 +86,7 @@ private:
 
     void                FillValueSet();
     void                SetSize();
-       DECL_LINK_TYPED( SelectHdl, ValueSet*, void );
+       DECL_LINK( SelectHdl, ValueSet*, void );
 
     /** This function is called when the window gets the focus.  It grabs
         the focus to the color value set so that it can be controlled with
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index eb863a166f55..361a7185e6c8 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -63,17 +63,17 @@ private:
 
     void Initialize();
 
-    DECL_LINK_TYPED( EndSlideHdl, Slider*, void );
-    DECL_LINK_TYPED( NewInterpolationModifiedHdl, ListBox&, void );
-    DECL_LINK_TYPED( NewQualityModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( NewCompressionModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( NewWidthModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( NewHeightModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( ResolutionModifiedHdl, Edit&, void );
-    DECL_LINK_TYPED( ToggleCompressionRB, RadioButton&, void );
-    DECL_LINK_TYPED( ToggleReduceResolutionRB, CheckBox&, void );
-
-    DECL_LINK_TYPED( CalculateClickHdl, Button*, void );
+    DECL_LINK( EndSlideHdl, Slider*, void );
+    DECL_LINK( NewInterpolationModifiedHdl, ListBox&, void );
+    DECL_LINK( NewQualityModifiedHdl, Edit&, void );
+    DECL_LINK( NewCompressionModifiedHdl, Edit&, void );
+    DECL_LINK( NewWidthModifiedHdl, Edit&, void );
+    DECL_LINK( NewHeightModifiedHdl, Edit&, void );
+    DECL_LINK( ResolutionModifiedHdl, Edit&, void );
+    DECL_LINK( ToggleCompressionRB, RadioButton&, void );
+    DECL_LINK( ToggleReduceResolutionRB, CheckBox&, void );
+
+    DECL_LINK( CalculateClickHdl, Button*, void );
 
     void Update();
     void UpdateNewWidthMF();
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 50aa6544fac3..de280f393da2 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -193,13 +193,13 @@ private:
     VclPtr<Edit>           m_pEdComment;
     bool                   bModified;
 
-    DECL_LINK_TYPED( SelDateHdl, ListBox&, void );
-    DECL_LINK_TYPED( RowEnableHdl, Button*, void );
-    DECL_LINK_TYPED( TimeHdl, Button*, void );
-    DECL_LINK_TYPED( ModifyHdl, Edit&, void );
-    DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void );
-    DECL_LINK_TYPED( ModifyDate, Edit&, void );
-    DECL_LINK_TYPED( RefHandle, Button*, void );
+    DECL_LINK( SelDateHdl, ListBox&, void );
+    DECL_LINK( RowEnableHdl, Button*, void );
+    DECL_LINK( TimeHdl, Button*, void );
+    DECL_LINK( ModifyHdl, Edit&, void );
+    DECL_LINK( ModifyListBoxHdl, ListBox&, void );
+    DECL_LINK( ModifyDate, Edit&, void );
+    DECL_LINK( RefHandle, Button*, void );
 
 protected:
 
@@ -294,7 +294,7 @@ private:
     bool bEnableRejectAll;
     bool bEnableUndo;
 
-    DECL_LINK_TYPED( PbClickHdl, Button*, void );
+    DECL_LINK( PbClickHdl, Button*, void );
 
 public:
     SvxTPView(vcl::Window * pParent, VclBuilderContainer *pTopLevel);
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 68d8f20c86c1..fd322199f75f 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -155,10 +155,10 @@ protected:
 private:
     void                InvalidateControl();
 
-    DECL_LINK_TYPED( LinkedFieldModifyHdl, Edit&, void );
-    DECL_LINK_TYPED( LinkedFieldFocusHdl, Control&, void );
+    DECL_LINK( LinkedFieldModifyHdl, Edit&, void );
+    DECL_LINK( LinkedFieldFocusHdl, Control&, void );
     void LinkedFieldModifyHdl();
-    DECL_LINK_TYPED(SpinFieldHdl, SpinField&, void);
+    DECL_LINK(SpinFieldHdl, SpinField&, void);
 };
 
 /** Wrapper for usage of a DialControl in item connections. */
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 2fcdfcb31879..8e48d52090e7 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -173,10 +173,10 @@ public:
 
 protected:
 
-    DECL_LINK_TYPED( InternalInteractiveChange, Svx3DLightControl*, void);
-    DECL_LINK_TYPED( InternalSelectionChange, Svx3DLightControl*, void);
-    DECL_LINK_TYPED( ScrollBarMove, ScrollBar*, void);
-    DECL_LINK_TYPED( ButtonPress, Button*, void);
+    DECL_LINK( InternalInteractiveChange, Svx3DLightControl*, void);
+    DECL_LINK( InternalSelectionChange, Svx3DLightControl*, void);
+    DECL_LINK( ScrollBarMove, ScrollBar*, void);
+    DECL_LINK( ButtonPress, Button*, void);
 
     // initialize local parameters
     void Init();
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index e5f447465416..c7181a8a1ab3 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -60,8 +60,8 @@ private:
     sal_Int32           mnLastPosHatch;
     sal_Int32           mnLastPosBitmap;
 
-    DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void);
-    DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void);
+    DECL_LINK(SelectFillTypeHdl, ListBox&, void);
+    DECL_LINK(SelectFillAttrHdl, ListBox&, void);
 
 public:
     SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index d5c211ed4a13..4cd2b4979e5b 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -186,16 +186,16 @@ private:
     // ItemSet used to remember set 2d attributes
     SfxItemSet*         mpRemember2DAttributes;
 
-    DECL_LINK_TYPED( ClickViewTypeHdl, Button*, void );
-    DECL_LINK_TYPED( ClickUpdateHdl, Button*, void );
-    DECL_LINK_TYPED( ClickAssignHdl, Button*, void );
-    DECL_LINK_TYPED( ClickHdl, Button*, void );
-    DECL_LINK_TYPED( ClickColorHdl, Button*, void );
-    DECL_LINK_TYPED( SelectHdl, ListBox&, void );
-    DECL_LINK_TYPED( ModifyHdl, Edit&, void );
+    DECL_LINK( ClickViewTypeHdl, Button*, void );
+    DECL_LINK( ClickUpdateHdl, Button*, void );
+    DECL_LINK( ClickAssignHdl, Button*, void );
+    DECL_LINK( ClickHdl, Button*, void );
+    DECL_LINK( ClickColorHdl, Button*, void );
+    DECL_LINK( SelectHdl, ListBox&, void );
+    DECL_LINK( ModifyHdl, Edit&, void );
     void ClickLight(PushButton &rBtn);
 
-    DECL_LINK_TYPED( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void );
+    DECL_LINK( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void );
 
     SVX_DLLPRIVATE void         Construct();
     SVX_DLLPRIVATE void         Reset();
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 2b5f0a586aef..f2e114c50ce9 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -79,7 +79,7 @@ protected:
     */
     void notifyColumnSelect(sal_uInt16 nColumnId);
 private:
-    DECL_LINK_TYPED( OnAsyncExecuteDrop, void*, void );
+    DECL_LINK( OnAsyncExecuteDrop, void*, void );
 };
 
 
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 67f8cefbf103..fdc0131a8227 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -520,8 +520,8 @@ protected:
     void selectionChanged();
     void columnChanged();
 
-    DECL_LINK_TYPED(OnQueryGridSlotState, DbGridControlNavigationBarState, int);
-    DECL_LINK_TYPED(OnExecuteGridSlot, DbGridControlNavigationBarState, bool);
+    DECL_LINK(OnQueryGridSlotState, DbGridControlNavigationBarState, int);
+    DECL_LINK(OnExecuteGridSlot, DbGridControlNavigationBarState, bool);
 };
 
 
diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx
index fa8515102ab1..50d81cc3f11c 100644
--- a/include/svx/fmobjfac.hxx
+++ b/include/svx/fmobjfac.hxx
@@ -33,7 +33,7 @@ public:
     FmFormObjFactory();
     ~FmFormObjFactory();
 
-    DECL_STATIC_LINK_TYPED(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* );
+    DECL_STATIC_LINK(FmFormObjFactory, MakeObject, SdrObjCreatorParams, SdrObject* );
 };
 
 #endif          // _FM_FMOBJFAC_HXX
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index ffcb6c1346fd..f58d1f61f87b 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -348,7 +348,7 @@ private:
 
     void OnSearchTerminated();
     // is used by SearchThread, after the return from this handler the thread removes itself
-    DECL_LINK_TYPED(OnNewRecordCount, sal_Int32, void);
+    DECL_LINK(OnNewRecordCount, sal_Int32, void);
 };
 
 #endif // INCLUDED_SVX_FMSRCIMP_HXX
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 8ef0eb84187a..5fe6ad0f7eb3 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -143,14 +143,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
  friend class SvxFontWorkChildWindow;
  friend class SvxFontWorkControllerItem;
 
-    DECL_LINK_TYPED( SelectStyleHdl_Impl, ToolBox *, void );
-    DECL_LINK_TYPED( SelectAdjustHdl_Impl, ToolBox *, void );
-    DECL_LINK_TYPED( SelectShadowHdl_Impl, ToolBox *, void );
+    DECL_LINK( SelectStyleHdl_Impl, ToolBox *, void );
+    DECL_LINK( SelectAdjustHdl_Impl, ToolBox *, void );
+    DECL_LINK( SelectShadowHdl_Impl, ToolBox *, void );
 
-    DECL_LINK_TYPED( ModifyInputHdl_Impl, Edit&, void );
-    DECL_LINK_TYPED( InputTimoutHdl_Impl, Idle *, void );
+    DECL_LINK( ModifyInputHdl_Impl, Edit&, void );
+    DECL_LINK( InputTimoutHdl_Impl, Idle *, void );
 
-    DECL_LINK_TYPED( ColorSelectHdl_Impl, ListBox&, void );
+    DECL_LINK( ColorSelectHdl_Impl, ListBox&, void );
 
     void SetStyle_Impl(const XFormTextStyleItem*);
     void SetAdjust_Impl(const XFormTextAdjustItem*);
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 0149c022c26a..3c2368cdb9c2 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -68,8 +68,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog
 
     SdrView*            mpSdrView;
 
-    DECL_LINK_TYPED( DoubleClickFavoriteHdl, ValueSet*, void );
-    DECL_LINK_TYPED( ClickOKHdl, Button*, void );
+    DECL_LINK( DoubleClickFavoriteHdl, ValueSet*, void );
+    DECL_LINK( ClickOKHdl, Button*, void );
 
     SdrObject**         mppSdrObject;
     SdrModel*           mpDestModel;
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index 1cb11c82ad20..35f79fd076fa 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -46,7 +46,7 @@ public:
     virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                               const SfxPoolItem* pState ) override;
 private:
-    DECL_LINK_TYPED( WaitDoubleClickHdl, Timer*, void );
+    DECL_LINK( WaitDoubleClickHdl, Timer*, void );
     void impl_executePaintBrush();
 
 private:
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 6ae29851ef5a..fd0aa8badf82 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -130,7 +130,7 @@ public:
     SgaUserDataFactory() { SdrObjFactory::InsertMakeUserDataHdl( LINK(this,SgaUserDataFactory,MakeUserData) ); }
     ~SgaUserDataFactory() { SdrObjFactory::RemoveMakeUserDataHdl( LINK(this,SgaUserDataFactory,MakeUserData) ); }
 
-    DECL_STATIC_LINK_TYPED( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* );
+    DECL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, SdrObjUserData* );
 };
 
 class GraphicFilter;
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 49d2f2e263ed..b4dab163f1c8 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -54,7 +54,7 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
     bool                bAnim;
     bool                mbInIdleUpdate;
 
-                        DECL_LINK_TYPED( UpdateHdl, Idle*, void );
+                        DECL_LINK( UpdateHdl, Idle*, void );
 
     rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
 
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index bc48342c9995..dc3a1d1ecfb8 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -219,7 +219,7 @@ public:
         virtual void StateChanged( StateChangedType nType ) override;
 
     private:
-        DECL_LINK_TYPED(OnClick, Button*, void);
+        DECL_LINK(OnClick, Button*, void);
 
         void PositionDataSource(sal_Int32 nRecord);
     };
@@ -589,9 +589,9 @@ protected:
 
 protected:
     void ImplInitWindow( const InitWindowFacet _eInitWhat );
-    DECL_LINK_TYPED(OnDelete, void*, void);
+    DECL_LINK(OnDelete, void*, void);
 
-    DECL_LINK_TYPED(OnAsyncAdjust, void*, void);
+    DECL_LINK(OnAsyncAdjust, void*, void);
         // if the param is != NULL, AdjustRows will be called, else AdjustDataSource
 
 private:
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index f7a6b7674e64..97f6b66a4d59 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -92,12 +92,12 @@ protected:
     bool            mbEnableDrawingLayerFillStyles : 1;
 
     void            InitHandler();
-    DECL_LINK_TYPED(TurnOnHdl, Button*, void);
-    DECL_LINK_TYPED(DistModify, Edit&, void);
-    DECL_LINK_TYPED(HeightModify, Edit&, void);
-    DECL_LINK_TYPED(BorderModify, Edit&, void);
-    DECL_LINK_TYPED(BackgroundHdl, Button*, void);
-    DECL_LINK_TYPED(RangeFocusHdl, Control&, void);
+    DECL_LINK(TurnOnHdl, Button*, void);
+    DECL_LINK(DistModify, Edit&, void);
+    DECL_LINK(HeightModify, Edit&, void);
+    DECL_LINK(BorderModify, Edit&, void);
+    DECL_LINK(BackgroundHdl, Button*, void);
+    DECL_LINK(RangeFocusHdl, Control&, void);
     void RangeHdl();
     void            UpdateExample();
 
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 50dc9fed2572..6747d5afe40d 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -118,16 +118,16 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
 
     virtual bool    Close() override;
 
-    DECL_LINK_TYPED( TbxClickHdl, ToolBox*, void );
-    DECL_LINK_TYPED( InfoHdl, IMapWindow&, void );
-    DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void );
-    DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void );
-    DECL_LINK_TYPED( URLModifyHdl, Edit&, void );
-    DECL_LINK_TYPED( URLModifyComboBoxHdl, ComboBox&, void );
-    DECL_LINK_TYPED( URLLoseFocusHdl, Control&, void );
-    DECL_LINK_TYPED( UpdateHdl, Idle *, void );
-    DECL_LINK_TYPED( StateHdl, GraphCtrl*, void );
-    DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void );
+    DECL_LINK( TbxClickHdl, ToolBox*, void );
+    DECL_LINK( InfoHdl, IMapWindow&, void );
+    DECL_LINK( MousePosHdl, GraphCtrl*, void );
+    DECL_LINK( GraphSizeHdl, GraphCtrl*, void );
+    DECL_LINK( URLModifyHdl, Edit&, void );
+    DECL_LINK( URLModifyComboBoxHdl, ComboBox&, void );
+    DECL_LINK( URLLoseFocusHdl, Control&, void );
+    DECL_LINK( UpdateHdl, Idle *, void );
+    DECL_LINK( StateHdl, GraphCtrl*, void );
+    DECL_LINK( MiscHdl, LinkParamNone*, void );
 
     void                DoOpen();
     bool                DoSave();
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index f6a50c3d967d..c5bc3c17a20d 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -41,7 +41,7 @@ class SvxLineBox : public LineLB
     SfxObjectShell* mpSh;
     css::uno::Reference< css::frame::XFrame > mxFrame;
 
-                    DECL_LINK_TYPED(DelayHdl_Impl, Timer *, void);
+                    DECL_LINK(DelayHdl_Impl, Timer *, void);
 
     void            ReleaseFocus_Impl();
 
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 474348e9a07f..a32e5f0ee452 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -181,7 +181,7 @@ private:
     SVX_DLLPRIVATE virtual void         ImplSaveValue() override;
     SVX_DLLPRIVATE virtual sal_Int32    ImplGetSavedValue() const override;
 
-    DECL_LINK_TYPED( EditModifyHdl, Edit&, void );
+    DECL_LINK( EditModifyHdl, Edit&, void );
 };
 
 #endif
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index e3d1b0b25584..44cc61fcf6ad 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -37,8 +37,8 @@ protected:
 
     void    Impl_SetInfo( sal_Int32 nCount );
 
-    DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void );
-    DECL_LINK_TYPED( SelectHdl, ListBox&, void );
+    DECL_LINK( PopupModeEndHdl, FloatingWindow*, void );
+    DECL_LINK( SelectHdl, ListBox&, void );
 
 public:
     SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index e11ef5b7b9f2..e29fe6c785aa 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -90,7 +90,7 @@ private:
     css::uno::Reference< css::frame::XFrame > mxFrame;
 
 
-    DECL_LINK_TYPED( SelectHdl, ValueSet*, void );
+    DECL_LINK( SelectHdl, ValueSet*, void );
     void            FillValueSet();
     void            SetSize();
     void            implInit();
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index 354d0ebae09a..d820fb21cb39 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -43,7 +43,7 @@ public:
     SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
 
 private: // Links
-    DECL_LINK_TYPED( OnTimer, Idle *, void );
+    DECL_LINK( OnTimer, Idle *, void );
 
 private: // Functions
     void _repaint();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 0979d2c74f39..708eeb78ef97 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
     void init();
 
 protected:
-        DECL_LINK_TYPED(FormatHdl_Impl, Idle *, void);
+        DECL_LINK(FormatHdl_Impl, Idle *, void);
 
 public:
     SvxBmpNumValueSet(vcl::Window* pParent, WinBits nWinBits = WB_TABSTOP);
diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx
index b06020c276d9..8c9761e6b6d6 100644
--- a/include/svx/objfac3d.hxx
+++ b/include/svx/objfac3d.hxx
@@ -40,7 +40,7 @@ public:
     E3dObjFactory();
     ~E3dObjFactory();
 
-    DECL_STATIC_LINK_TYPED(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*);
+    DECL_STATIC_LINK(E3dObjFactory, MakeObject, SdrObjCreatorParams, SdrObject*);
 };
 
 
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index b0e2e59f92a8..ab00b9fe37b9 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -141,10 +141,10 @@ protected:
 private:
     bool                bAttrModified;
 
-    DECL_LINK_TYPED( ClickRotateHdl_Impl, Button*, void );
-    DECL_LINK_TYPED( ChangeDrawHdl_Impl, Edit&, void );
-    DECL_LINK_TYPED( ChangeGridsnapHdl_Impl, Button*, void );
-    DECL_LINK_TYPED( ChangeDivisionHdl_Impl, Edit&, void );
+    DECL_LINK( ClickRotateHdl_Impl, Button*, void );
+    DECL_LINK( ChangeDrawHdl_Impl, Edit&, void );
+    DECL_LINK( ChangeGridsnapHdl_Impl, Button*, void );
+    DECL_LINK( ChangeDivisionHdl_Impl, Edit&, void );
 };
 
 #endif
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 434d66660125..448c78513942 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -47,8 +47,8 @@ private:
 
     bool              bEmpty;
 
-    DECL_LINK_TYPED(ButtonHdl, Button*, void);
-    DECL_LINK_TYPED(EditModifyHdl, Edit&, void);
+    DECL_LINK(ButtonHdl, Button*, void);
+    DECL_LINK(EditModifyHdl, Edit&, void);
 
 public:
                     SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false );
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index 3a8bfed02ea9..fb71960ffbef 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -116,16 +116,16 @@ class SvxRubyDialog : public SfxModelessDialog
 
     SfxBindings*        pBindings;
 
-    DECL_LINK_TYPED(ApplyHdl_Impl, Button*, void);
-    DECL_LINK_TYPED(CloseHdl_Impl, Button*, void);
-    DECL_LINK_TYPED(StylistHdl_Impl, Button*, void);
-    DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void);
-    DECL_LINK_TYPED(PositionHdl_Impl, ListBox&, void);
-    DECL_LINK_TYPED(AdjustHdl_Impl, ListBox&, void);
-    DECL_LINK_TYPED(CharStyleHdl_Impl, ListBox&, void);
-    DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void);
-    DECL_LINK_TYPED(EditScrollHdl_Impl, sal_Int32, bool);
-    DECL_LINK_TYPED(EditJumpHdl_Impl, sal_Int32, void);
+    DECL_LINK(ApplyHdl_Impl, Button*, void);
+    DECL_LINK(CloseHdl_Impl, Button*, void);
+    DECL_LINK(StylistHdl_Impl, Button*, void);
+    DECL_LINK(ScrollHdl_Impl, ScrollBar*, void);
+    DECL_LINK(PositionHdl_Impl, ListBox&, void);
+    DECL_LINK(AdjustHdl_Impl, ListBox&, void);
+    DECL_LINK(CharStyleHdl_Impl, ListBox&, void);
+    DECL_LINK(EditModifyHdl_Impl, Edit&, void);
+    DECL_LINK(EditScrollHdl_Impl, sal_Int32, bool);
+    DECL_LINK(EditJumpHdl_Impl, sal_Int32, void);
 
     void                SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight);
     void                GetRubyText();
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 7a81bbbc4c5d..d8a78516b156 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -214,8 +214,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
     long GetLeftMin() const;
     long GetRightMax() const;
 
-    DECL_LINK_TYPED( TabMenuSelect, Menu *, bool );
-    DECL_LINK_TYPED( MenuSelect, Menu *, bool );
+    DECL_LINK( TabMenuSelect, Menu *, bool );
+    DECL_LINK( MenuSelect, Menu *, bool );
     void PrepareProportional_Impl(RulerType);
 
     enum class UpdateType
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 0ea072adafa3..b69cbd801bd5 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -159,7 +159,7 @@ private:
 
     SVX_DLLPRIVATE void findMergeOrigin( CellPos& rPos );
 
-    DECL_LINK_TYPED( UpdateHdl, void *, void );
+    DECL_LINK( UpdateHdl, void *, void );
 
     //TableModelRef mxTable;
     rtl::Reference< TableModel > mxTable;
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index b3a37c068b79..18c58176bb7a 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -160,16 +160,16 @@ protected:
 
     sfx2::sidebar::SidebarController* mpSidebarController;
 
-    DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void );
-    DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void );
-    DECL_LINK_TYPED(ChangeGradientAngle, Edit&, void);
-    DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void);
-    DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void);
-    DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void);
-    DECL_LINK_TYPED(ClickImportBitmapHdl, Button*, void);
+    DECL_LINK(SelectFillTypeHdl, ListBox&, void );
+    DECL_LINK(SelectFillAttrHdl, ListBox&, void );
+    DECL_LINK(ChangeGradientAngle, Edit&, void);
+    DECL_LINK(ChangeTrgrTypeHdl_Impl, ListBox&, void);
+    DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void);
+    DECL_LINK(ModifyTransSliderHdl, Slider*, void);
+    DECL_LINK(ClickImportBitmapHdl, Button*, void);
 
     // for transparency gradient
-    DECL_LINK_TYPED( ClickTrGrHdl_Impl, ToolBox*, void );
+    DECL_LINK( ClickTrGrHdl_Impl, ToolBox*, void );
 
     void Initialize();
     void Update();
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 0d173380c527..0cab1bd447bb 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -160,13 +160,13 @@ private:
 
     void Initialize();
 
-    DECL_LINK_TYPED(ChangeLineStyleHdl, ListBox&, void);
-    DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void);
-    DECL_LINK_TYPED(ChangeTransparentHdl, Edit&, void );
-    DECL_LINK_TYPED(ChangeStartHdl, ListBox&, void);
-    DECL_LINK_TYPED(ChangeEndHdl, ListBox&, void);
-    DECL_LINK_TYPED(ChangeEdgeStyleHdl, ListBox&, void);
-    DECL_LINK_TYPED(ChangeCapStyleHdl, ListBox&, void);
+    DECL_LINK(ChangeLineStyleHdl, ListBox&, void);
+    DECL_LINK(ToolboxWidthSelectHdl, ToolBox*, void);
+    DECL_LINK(ChangeTransparentHdl, Edit&, void );
+    DECL_LINK(ChangeStartHdl, ListBox&, void);
+    DECL_LINK(ChangeEndHdl, ListBox&, void);
+    DECL_LINK(ChangeEdgeStyleHdl, ListBox&, void);
+    DECL_LINK(ChangeCapStyleHdl, ListBox&, void);
 };
 
 } } // end of namespace svx::sidebar
diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx
index bdeeebe6c50f..fd7a0ea8215b 100644
--- a/include/svx/sidebar/LineWidthPopup.hxx
+++ b/include/svx/sidebar/LineWidthPopup.hxx
@@ -57,8 +57,8 @@ private:
     Image m_aIMGCus;
     Image m_aIMGCusGray;
 
-    DECL_LINK_TYPED(VSSelectHdl, ValueSet*, void);
-    DECL_LINK_TYPED(MFModifyHdl, Edit&, void);
+    DECL_LINK(VSSelectHdl, ValueSet*, void);
+    DECL_LINK(MFModifyHdl, Edit&, void);
 };
 
 } } // end of namespace svx::sidebar
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index 7b1c15cdb853..d69607b89b90 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -29,7 +29,7 @@ private:
     bool m_bInClose;
     bool hasPanelPendingLayout() const;
 
-    DECL_DLLPRIVATE_LINK_TYPED(ImplHandlePanelLayoutTimerHdl, Idle*, void);
+    DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void);
 
 public:
     PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 89a5ee728017..8a598a6ecb54 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -234,17 +234,17 @@ private:
 
     mutable sal_Int32           nTransliterationFlags;
 
-    DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void );
-    DECL_LINK_TYPED( FlagHdl_Impl, Button*, void );
-    DECL_LINK_TYPED( CommandHdl_Impl, Button*, void );
-    DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void);
-    DECL_LINK_TYPED( FocusHdl_Impl, Control&, void );
-    DECL_LINK_TYPED( LBSelectHdl_Impl, ListBox&, void );
-    DECL_LINK_TYPED(LoseFocusHdl_Impl, Control&, void);
-    DECL_LINK_TYPED(FormatHdl_Impl, Button*, void);
-    DECL_LINK_TYPED(NoFormatHdl_Impl, Button*, void);
-    DECL_LINK_TYPED(AttributeHdl_Impl, Button*, void);
-    DECL_LINK_TYPED( TimeoutHdl_Impl, Timer*, void );
+    DECL_LINK( ModifyHdl_Impl, Edit&, void );
+    DECL_LINK( FlagHdl_Impl, Button*, void );
+    DECL_LINK( CommandHdl_Impl, Button*, void );
+    DECL_LINK(TemplateHdl_Impl, Button*, void);
+    DECL_LINK( FocusHdl_Impl, Control&, void );
+    DECL_LINK( LBSelectHdl_Impl, ListBox&, void );
+    DECL_LINK(LoseFocusHdl_Impl, Control&, void);
+    DECL_LINK(FormatHdl_Impl, Button*, void);
+    DECL_LINK(NoFormatHdl_Impl, Button*, void);
+    DECL_LINK(AttributeHdl_Impl, Button*, void);
+    DECL_LINK( TimeoutHdl_Impl, Timer*, void );
     void            ClickHdl_Impl(void* pCtrl);
 
     void            Construct_Impl();
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index d293e3afb356..64abea3efdf3 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -117,7 +117,7 @@ protected:
 
     // Chaining
     void ImpChainingEventHdl();
-    DECL_LINK_TYPED(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void);
+    DECL_LINK(ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void);
 
 
     // Check if the whole text is selected.
@@ -126,17 +126,17 @@ protected:
     void ImpMakeTextCursorAreaVisible();
 
     // handler for AutoGrowing text with active Outliner
-    DECL_LINK_TYPED(ImpOutlinerStatusEventHdl, EditStatus&, void);
-    DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void);
+    DECL_LINK(ImpOutlinerStatusEventHdl, EditStatus&, void);
+    DECL_LINK(ImpOutlinerCalcFieldValueHdl, EditFieldInfo*, void);
 
     // link for EndTextEditHdl
-    DECL_LINK_TYPED(EndTextEditHdl, SdrUndoManager*, void);
+    DECL_LINK(EndTextEditHdl, SdrUndoManager*, void);
 
     void ImpMacroUp(const Point& rUpPos);
     void ImpMacroDown(const Point& rDownPos);
 
-    DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos*, void );
-    DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos*, void );
+    DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos*, void );
+    DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos*, void );
 
 protected:
     // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index c2bcefb44431..8b3c01e3054e 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -184,7 +184,7 @@ class OLEObjCache
 
     void UnloadOnDemand();
     static bool UnloadObj( SdrOle2Obj* pObj );
-    DECL_LINK_TYPED( UnloadCheckHdl, Timer*, void );
+    DECL_LINK( UnloadCheckHdl, Timer*, void );
 
 public:
     OLEObjCache();
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 43fc5568ee0c..0a001b065bee 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -313,7 +313,7 @@ public:
     void Set2ndPos(const Point& rPnt);
 
     // the link called by the color handles
-    DECL_LINK_TYPED(ColorChangeHdl, SdrHdlColor*, void);
+    DECL_LINK(ColorChangeHdl, SdrHdlColor*, void);
 
     // transformation call, create gradient from this handle
     void FromIAOToItem(SdrObject* pObj, bool bSetItemOnObject, bool bUndo);
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 81c7969e4bc8..caae687a7ae2 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -111,7 +111,7 @@ private:
     void                    ImpLinkAbmeldung();
     bool                    ImpUpdateGraphicLink( bool bAsynchron = true ) const;
     void                    ImpSetLinkedGraphic( const Graphic& rGraphic );
-                            DECL_LINK_TYPED( ImpSwapHdl, const GraphicObject*, SvStream* );
+                            DECL_LINK( ImpSwapHdl, const GraphicObject*, SvStream* );
     void onGraphicChanged();
 
 public:
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 07cacf1ebfd7..cde8018d76fa 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -223,7 +223,7 @@ public:
 
 private:
     SVX_DLLPRIVATE void ImpClearVars();
-    DECL_LINK_TYPED(ImpComeBackHdl, Idle*, void);
+    DECL_LINK(ImpComeBackHdl, Idle*, void);
 
 protected:
     sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index a1505473cc5c..6785370fb1e2 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -169,7 +169,7 @@ public:
     virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
                               const SfxPoolItem* pState) override;
 
-    DECL_LINK_TYPED( VisibilityNotification, SvxStyleBox_Impl&, void );
+    DECL_LINK( VisibilityNotification, SvxStyleBox_Impl&, void );
 protected:
     // XInitialization
     virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& aArguments)
@@ -236,7 +236,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
     BorderColorStatus maBorderColorStatus;
     bool bSidebarType;
     ColorSelectFunction maColorSelectFunction;
-    DECL_LINK_TYPED(SelectedHdl, const Color&, void);
+    DECL_LINK(SelectedHdl, const Color&, void);
 public:
     SFX_DECL_TOOLBOX_CONTROL();
     SvxColorToolBoxControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rToolBox);