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

28 files changed, 52 insertions, 52 deletions

diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 75503dea309d..640ae95628cd 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -183,7 +183,7 @@ private:
     bool            mbLoopTerminated;
 
     SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplTimeoutHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer*, void );
 
 };
 
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 4d54f8efd0c5..139033b21193 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -95,7 +95,7 @@ private:
     SAL_DLLPRIVATE void             ImplInitButtonDialogData();
     SAL_DLLPRIVATE VclPtr<PushButton> ImplCreatePushButton( ButtonDialogFlags nBtnFlags );
     SAL_DLLPRIVATE ImplBtnDlgItem*  ImplGetItem( sal_uInt16 nId ) const;
-    DECL_DLLPRIVATE_LINK_TYPED(     ImplClickHdl, Button* pBtn, void );
+    DECL_DLLPRIVATE_LINK(     ImplClickHdl, Button* pBtn, void );
     SAL_DLLPRIVATE void             ImplPosControls();
 
 };
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 8350a212b396..36103705abd9 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -101,7 +101,7 @@ public:
 protected:
 
     /// Handler for click, in case we want the button to handle uno commands (.uno:Something).
-    DECL_STATIC_LINK_TYPED(Button, dispatchCommandHandler, Button*, void);
+    DECL_STATIC_LINK(Button, dispatchCommandHandler, Button*, void);
 };
 
 enum class PushButtonDropdownStyle
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index ab5a2e249d3e..59cac2799a9f 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -55,7 +55,7 @@ private:
 
 public:
     SAL_DLLPRIVATE void         ImplDraw();
-    DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer*, void );
     SAL_DLLPRIVATE void         ImplShow();
     SAL_DLLPRIVATE void         ImplHide();
     SAL_DLLPRIVATE void         ImplResume( bool bRestore = false );
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 3246574bd418..da3aa7e37a46 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -56,7 +56,7 @@ private:
     SAL_DLLPRIVATE         Dialog (const Dialog &) = delete;
     SAL_DLLPRIVATE         Dialog & operator= (const Dialog &) = delete;
 
-    DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncCloseHdl, void*, void );
+    DECL_DLLPRIVATE_LINK( ImplAsyncCloseHdl, void*, void );
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index a3d0a7bcfce3..7fb7a89fb4df 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -109,7 +109,7 @@ private:
                     mbStartDockingEnabled:1,
                     mbLocked:1;
 
-                    DECL_LINK_TYPED( PopupModeEnd, FloatingWindow*, void );
+                    DECL_LINK( PopupModeEnd, FloatingWindow*, void );
     void            ImplEnableStartDocking()  { mbStartDockingEnabled = true; }
     bool            ImplStartDockingEnabled() { return mbStartDockingEnabled; }
 
@@ -245,7 +245,7 @@ private:
 
     SAL_DLLPRIVATE void    ImplInitDockingWindowData();
     SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);
-    DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void );
 
                            DockingWindow (const DockingWindow &) = delete;
                            DockingWindow & operator= (const DockingWindow &) = delete;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 05f56bc3afef..8bc6b2bf642d 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -97,7 +97,7 @@ private:
 
     css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC;
 
-    DECL_DLLPRIVATE_LINK_TYPED(ImplUpdateDataHdl, Timer*, void);
+    DECL_DLLPRIVATE_LINK(ImplUpdateDataHdl, Timer*, void);
 
     SAL_DLLPRIVATE bool        ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const;
     SAL_DLLPRIVATE void        ImplInitEditData();
diff --git a/include/vcl/evntpost.hxx b/include/vcl/evntpost.hxx
index 276c8879aed5..bbd11ce2d24d 100644
--- a/include/vcl/evntpost.hxx
+++ b/include/vcl/evntpost.hxx
@@ -32,7 +32,7 @@ namespace vcl
         ImplSVEvent *             m_nId;
         Link<LinkParamNone*,void> m_aLink;
 
-        DECL_DLLPRIVATE_LINK_TYPED( DoEvent_Impl, void*, void );
+        DECL_DLLPRIVATE_LINK( DoEvent_Impl, void*, void );
 
     public:
                         EventPoster( const Link<LinkParamNone*,void>& rLink );
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index c1e0d3008565..414fcee0aac2 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -102,7 +102,7 @@ private:
     Link<FloatingWindow*,void> maPopupModeEndHdl;
 
     SAL_DLLPRIVATE void    ImplCallPopupModeEnd();
-    DECL_DLLPRIVATE_LINK_TYPED(  ImplEndPopupModeHdl, void*, void );
+    DECL_DLLPRIVATE_LINK(  ImplEndPopupModeHdl, void*, void );
     virtual void setPosSizeOnContainee(Size aSize, Window &rBox) override;
 
                            FloatingWindow (const FloatingWindow &) = delete;
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index a32b1013b4ab..2623498c29b0 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -232,7 +232,7 @@ private:
     sal_uLong           ImplSetError( sal_uLong nError, const SvStream* pStm = nullptr );
     sal_uInt16      ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat );
 
-                    DECL_LINK_TYPED( FilterCallback, ConvertData&, bool );
+                    DECL_LINK( FilterCallback, ConvertData&, bool );
 
 protected:
 
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 6f75909dd109..862326041f91 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -391,7 +391,7 @@ private:
 private:
     friend class VclBuilder;
     void designate_label(vcl::Window *pWindow);
-    DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void);
+    DECL_LINK(WindowEventListener, VclWindowEvent&, void);
 public:
     VclFrame(vcl::Window *pParent)
         : VclBin(pParent)
@@ -479,7 +479,7 @@ private:
     bool m_bResizeTopLevel;
     VclPtr<DisclosureButton> m_pDisclosureButton;
     Link<VclExpander&,void> maExpandedHdl;
-    DECL_DLLPRIVATE_LINK_TYPED(ClickHdl, CheckBox&, void);
+    DECL_DLLPRIVATE_LINK(ClickHdl, CheckBox&, void);
 };
 
 class VCL_DLLPUBLIC VclScrolledWindow : public VclBin
@@ -500,7 +500,7 @@ public:
 protected:
     virtual Size calculateRequisition() const override;
     virtual void setAllocation(const Size &rAllocation) override;
-    DECL_LINK_TYPED(ScrollBarHdl, ScrollBar*, void);
+    DECL_LINK(ScrollBarHdl, ScrollBar*, void);
     void InitScrollBars(const Size &rRequest);
     virtual bool Notify(NotifyEvent& rNEvt) override;
 private:
@@ -652,7 +652,7 @@ private:
     std::map< VclPtr<const vcl::Window>, short> m_aResponses;
     OUString m_sPrimaryString;
     OUString m_sSecondaryString;
-    DECL_DLLPRIVATE_LINK_TYPED(ButtonHdl, Button *, void);
+    DECL_DLLPRIVATE_LINK(ButtonHdl, Button *, void);
     void setButtonHandlers(VclButtonBox *pButtonBox);
     short get_response(const vcl::Window *pWindow) const;
     void create_owned_areas();
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 455a82aa184b..f4ae404de91a 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -91,17 +91,17 @@ private:
 private:
     SAL_DLLPRIVATE void    ImplInitListBoxData();
 
-    DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ImplListBox*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplCancelHdl, LinkParamNone*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplDoubleClickHdl, ImplListBoxWindow*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplSelectionChangedHdl, sal_Int32, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplUserDrawHdl, UserDrawEvent*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplFocusHdl, sal_Int32, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplListItemSelectHdl, LinkParamNone*, void );
-
-    DECL_DLLPRIVATE_LINK_TYPED( ImplClickBtnHdl, void*, void );
+    DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void );
+    DECL_DLLPRIVATE_LINK( ImplScrollHdl, ImplListBox*, void );
+    DECL_DLLPRIVATE_LINK( ImplCancelHdl, LinkParamNone*, void );
+    DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, ImplListBoxWindow*, void );
+    DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void );
+    DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, sal_Int32, void );
+    DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent*, void );
+    DECL_DLLPRIVATE_LINK( ImplFocusHdl, sal_Int32, void );
+    DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl, LinkParamNone*, void );
+
+    DECL_DLLPRIVATE_LINK( ImplClickBtnHdl, void*, void );
 
 protected:
     using Window::ImplInit;
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 6504edc8befc..38681ab2a169 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -183,7 +183,7 @@ protected:
     SAL_DLLPRIVATE void ImplSelect();
     SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem );
     SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos );
-    DECL_DLLPRIVATE_LINK_TYPED(ImplCallSelect, void*, void );
+    DECL_DLLPRIVATE_LINK(ImplCallSelect, void*, void );
 
     SAL_DLLPRIVATE void ImplFillLayoutData() const;
     SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; }
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 535ad84b8bfc..6063c5a61f78 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -43,7 +43,7 @@ private:
     Link<MenuButton*,void> maSelectHdl;
 
     SAL_DLLPRIVATE void    ImplInitMenuButtonData();
-    DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, Timer*, void );
 
                            MenuButton( const MenuButton & ) = delete;
                            MenuButton& operator=( const MenuButton & ) = delete;
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 897f13f41a95..bef8f7170fc8 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -84,7 +84,7 @@ private:
     SAL_DLLPRIVATE bool         ImplDrawNative(vcl::RenderContext& rRenderContext, sal_uInt16 nDrawFlags);
     SAL_DLLPRIVATE void         ImplDragThumb( const Point& rMousePos );
     SAL_DLLPRIVATE Size         getCurrentCalcSize() const;
-    DECL_DLLPRIVATE_LINK_TYPED( ImplAutoTimerHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, Timer*, void );
 
 public:
     explicit        ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT );
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index 140952b10b0d..430fe3af03fe 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -86,7 +86,7 @@ private:
     sal_uLong               nUpdateInterval;
     sal_uInt16              nLockedMods;
     SelectionEngineFlags    nFlags;
-    DECL_DLLPRIVATE_LINK_TYPED( ImpWatchDog, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer*, void );
 
     inline bool         ShouldDeselect( bool bModifierKey1 ) const;
                                 // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index a7e94d1a2eb7..3ab014c833b7 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -56,9 +56,9 @@ private:
     Link<Slider*,void>   maSlideHdl;
     Link<Slider*,void>   maEndSlideHdl;
 
-    DECL_LINK_TYPED(LinkedFieldModifyHdl, Edit&, void);
-    DECL_LINK_TYPED(LinkedFieldLoseFocusHdl, Control&, void);
-    DECL_LINK_TYPED(LinkedFieldSpinnerHdl, SpinField&, void);
+    DECL_LINK(LinkedFieldModifyHdl, Edit&, void);
+    DECL_LINK(LinkedFieldLoseFocusHdl, Control&, void);
+    DECL_LINK(LinkedFieldSpinnerHdl, SpinField&, void);
 
     using Control::ImplInitSettings;
     using Window::ImplInit;
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index b6168946d910..f88969c733b9 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -48,7 +48,7 @@ private:
     SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt );
     using Window::ImplInit;
     SAL_DLLPRIVATE void       ImplInit( vcl::Window* pParent, WinBits nStyle );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void );
 
 public:
     explicit        SpinButton( vcl::Window* pParent, WinBits nStyle );
diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx
index 552c939e6cb8..4e213e94c035 100644
--- a/include/vcl/spinfld.hxx
+++ b/include/vcl/spinfld.hxx
@@ -51,7 +51,7 @@ protected:
     SAL_DLLPRIVATE void   ImplInit( vcl::Window* pParent, WinBits nStyle );
 
 private:
-    DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplTimeout, Timer*, void );
     SAL_DLLPRIVATE void   ImplInitSpinFieldData();
     SAL_DLLPRIVATE void   ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea );
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 9476fad9739c..4ac5084bb2fe 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1400,7 +1400,7 @@ public:
     static void setDeInitHook(Link<LinkParamNone*,void> const & hook);
 
 private:
-    DECL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, void );
+    DECL_STATIC_LINK( Application, PostEventHandler, void*, void );
 };
 
 
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 90b42fdcd6ff..d3a44e78f63d 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -178,7 +178,7 @@ public:
 private:
     SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, vcl::Window* i_pConfigureWin );
     virtual void setPosSizeOnContainee(Size aSize, Window &rBox);
-    DECL_DLLPRIVATE_LINK_TYPED( ImplHandleLayoutTimerHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, Idle*, void );
 
 protected:
     // Single argument ctors shall be explicit.
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index fcb35d376684..4e2ae4fc6652 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -76,8 +76,8 @@ protected:
     SAL_DLLPRIVATE void         ImplFreeLayoutData();
     SAL_DLLPRIVATE bool         ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
 
-    DECL_DLLPRIVATE_LINK_TYPED( ImplListBoxSelectHdl, ListBox&, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplWindowEventListener, VclWindowEvent&, void );
+    DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, ListBox&, void );
+    DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclWindowEvent&, void );
 
     using Window::ImplInit;
     SAL_DLLPRIVATE void         ImplInit( vcl::Window* pParent, WinBits nStyle );
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index f528d0bde7cf..5a13c2390f6f 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -171,7 +171,7 @@ protected:
     void                ImpTextHeightChanged();
     void                ImpTextFormatted();
 
-    DECL_LINK_TYPED(    IdleFormatHdl, Idle *, void );
+    DECL_LINK(    IdleFormatHdl, Idle *, void );
     void                CheckIdleFormatter();
     void                IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 );
 
diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx
index 2f27657aafea..67baa061e3d5 100644
--- a/include/vcl/threadex.hxx
+++ b/include/vcl/threadex.hxx
@@ -38,7 +38,7 @@ namespace vcl
         long                    m_nReturn;
         bool                    m_bTimeout;
 
-        DECL_DLLPRIVATE_LINK_TYPED( worker, void*, void );
+        DECL_DLLPRIVATE_LINK( worker, void*, void );
 
     public:
         SolarThreadExecutor();
diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx
index f98f891e7cba..8dfda97c5a62 100644
--- a/include/vcl/throbber.hxx
+++ b/include/vcl/throbber.hxx
@@ -84,7 +84,7 @@ private:
     AutoTimer   maWaitTimer;
     ImageSet    meImageSet;
 
-    DECL_LINK_TYPED( TimeOutHdl, Timer*, void );
+    DECL_LINK( TimeOutHdl, Timer*, void );
 };
 
 #endif // INCLUDED_VCL_THROBBER_HXX
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index 51053e30cd07..fe3fa39d03e9 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -206,10 +206,10 @@ private:
     SAL_DLLPRIVATE bool            ImplHasExternalMenubutton();
     SAL_DLLPRIVATE void            ImplDrawFloatwinBorder(vcl::RenderContext& rRenderContext, ImplToolItem* pItem );
 
-    DECL_DLLPRIVATE_LINK_TYPED(    ImplCallExecuteCustomMenu, void*, void );
-    DECL_DLLPRIVATE_LINK_TYPED(    ImplUpdateHdl, Idle*, void );
-    DECL_DLLPRIVATE_LINK_TYPED(    ImplCustomMenuListener, VclMenuEvent&, void );
-    DECL_DLLPRIVATE_LINK_TYPED(    ImplDropdownLongClickHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK(    ImplCallExecuteCustomMenu, void*, void );
+    DECL_DLLPRIVATE_LINK(    ImplUpdateHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK(    ImplCustomMenuListener, VclMenuEvent&, void );
+    DECL_DLLPRIVATE_LINK(    ImplDropdownLongClickHdl, Timer*, void );
 
                                    ToolBox (const ToolBox &) = delete;
                           ToolBox& operator= (const ToolBox &) = delete;
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index c6436f9c7de9..f89447fc116c 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -43,7 +43,7 @@ private:
 
 protected:
 
-    DECL_LINK_TYPED( ImpUpdateDataHdl, Timer*, void );
+    DECL_LINK( ImpUpdateDataHdl, Timer*, void );
     void            StateChanged( StateChangedType nType ) override;
     void            DataChanged( const DataChangedEvent& rDCEvt ) override;
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8c82fa9d6720..7de1c77b83a0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -541,11 +541,11 @@ private:
 
 public:
 
-    DECL_DLLPRIVATE_LINK_TYPED( ImplHandlePaintHdl, Idle*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplGenerateMouseMoveHdl, void*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplAsyncFocusHdl, void*, void );
-    DECL_DLLPRIVATE_LINK_TYPED( ImplHandleResizeTimerHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, Idle*, void );
+    DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void*, void );
+    DECL_DLLPRIVATE_LINK( ImplTrackTimerHdl, Timer*, void );
+    DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void*, void );
+    DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, Idle*, void );
 
 
     SAL_DLLPRIVATE static void          ImplInitAppFontData( vcl::Window* pWindow );