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

29 files changed, 76 insertions, 76 deletions

diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index a09ba3634e57..12fbfb8e5827 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -443,12 +443,12 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve
 {
 }
 
-IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void )
+IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void )
 {
     m_aActions->EnableItem(m_nInsertId, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 ));
 }
 
-IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool )
+IMPL_LINK_NOARG( OAddFieldWindow, OnDoubleClickHdl, SvTreeListBox*, bool )
 {
     m_aCreateLink.Call(*this);
 
@@ -464,7 +464,7 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff)
     }
 }
 
-IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSortAction, ToolBox*, void )
+IMPL_LINK_NOARG( OAddFieldWindow, OnSortAction, ToolBox*, void )
 {
     const sal_uInt16 nCurItem = m_aActions->GetCurItemId();
     if (nCurItem == m_nInsertId)
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index cb445f4b0021..837fb73d377a 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -308,7 +308,7 @@ namespace rptui
         impl_ensureConditionVisible( nNewConditionIndex );
     }
 
-    IMPL_LINK_TYPED( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/, void )
+    IMPL_LINK( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/, void )
     {
         size_t nFirstCondIndex( impl_getFirstVisibleConditionIndex() );
         size_t nFocusCondIndex = impl_getFocusedConditionIndex( nFirstCondIndex );
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 6a48e9dc85de..b0a67b116efe 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -66,7 +66,7 @@ ConditionField::ConditionField(Condition* pParent, Edit* pSubEdit, PushButton *p
     m_pFormula->SetClickHdl( LINK( this, ConditionField, OnFormula ) );
 }
 
-IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void )
+IMPL_LINK( ConditionField, OnFormula, Button*, _pClickedButton, void )
 {
     OUString sFormula(m_pSubEdit->GetText());
     const sal_Int32 nLen = sFormula.getLength();
@@ -94,7 +94,7 @@ IMPL_LINK_TYPED( ConditionField, OnFormula, Button*, _pClickedButton, void )
 #define PALETTE_SIZE (PALETTE_X * PALETTE_Y)
 class OColorPopup : public FloatingWindow
 {
-    DECL_LINK_TYPED( SelectHdl, ValueSet*, void );
+    DECL_LINK( SelectHdl, ValueSet*, void );
     VclPtr<Condition>      m_pCondition;
     sal_uInt16             m_nSlotId;
 public:
@@ -193,7 +193,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(OColorPopup, SelectHdl, ValueSet*, void)
+IMPL_LINK_NOARG(OColorPopup, SelectHdl, ValueSet*, void)
 {
     sal_uInt16 nItemId = m_aColorSet->GetSelectItemId();
     Color aColor( nItemId == 0 ? Color( COL_TRANSPARENT ) : m_aColorSet->GetItemColor( nItemId ) );
@@ -332,7 +332,7 @@ void Condition::dispose()
     VclHBox::dispose();
 }
 
-IMPL_LINK_NOARG_TYPED( Condition, DropdownClick, ToolBox*, void )
+IMPL_LINK_NOARG( Condition, DropdownClick, ToolBox*, void )
 {
     sal_uInt16 nId( m_pActions->GetCurItemId() );
     if ( !m_pColorFloat )
@@ -355,13 +355,13 @@ IMPL_LINK_NOARG_TYPED( Condition, DropdownClick, ToolBox*, void )
     m_pColorFloat->StartSelection();
 }
 
-IMPL_LINK_NOARG_TYPED( Condition, OnFormatAction, ToolBox*, void )
+IMPL_LINK_NOARG( Condition, OnFormatAction, ToolBox*, void )
 {
     Color aCol(COL_AUTO);
     ApplyCommand(mapToolbarItemToSlotId(m_pActions->GetCurItemId()),aCol);
 }
 
-IMPL_LINK_TYPED( Condition, OnConditionAction, Button*, _pClickedButton, void )
+IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton, void )
 {
     if ( _pClickedButton == m_pMoveUp )
         m_rAction.moveConditionUp( getConditionIndex() );
@@ -398,13 +398,13 @@ void Condition::GetFocus()
         m_pCondLHS->GrabFocus();
 }
 
-IMPL_LINK_NOARG_TYPED( Condition, OnTypeSelected, ListBox&, void )
+IMPL_LINK_NOARG( Condition, OnTypeSelected, ListBox&, void )
 {
     impl_layoutOperands();
 }
 
 
-IMPL_LINK_NOARG_TYPED( Condition, OnOperationSelected, ListBox&, void )
+IMPL_LINK_NOARG( Condition, OnOperationSelected, ListBox&, void )
 {
     impl_layoutOperands();
 }
diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx
index d51980ca2385..ab5194ade94c 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -53,7 +53,7 @@ namespace rptui
         VclPtr<Edit>       m_pSubEdit;
         VclPtr<PushButton> m_pFormula;
 
-        DECL_LINK_TYPED( OnFormula,   Button*, void );
+        DECL_LINK( OnFormula,   Button*, void );
     public:
         ConditionField(Condition* pParent, Edit* pSubEdit, PushButton *pFormula);
         void GrabFocus() { m_pSubEdit->GrabFocus(); }
@@ -100,9 +100,9 @@ namespace rptui
 
         ConditionalExpressions          m_aConditionalExpressions;
 
-        DECL_LINK_TYPED( OnFormatAction, ToolBox*, void );
-        DECL_LINK_TYPED( DropdownClick, ToolBox*, void );
-        DECL_LINK_TYPED( OnConditionAction, Button*, void );
+        DECL_LINK( OnFormatAction, ToolBox*, void );
+        DECL_LINK( DropdownClick, ToolBox*, void );
+        DECL_LINK( OnConditionAction, Button*, void );
 
     public:
         Condition( vcl::Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController );
@@ -167,8 +167,8 @@ namespace rptui
         void    impl_setCondition( const OUString& _rConditionFormula );
 
     private:
-        DECL_LINK_TYPED( OnTypeSelected, ListBox&, void );
-        DECL_LINK_TYPED( OnOperationSelected, ListBox&, void );
+        DECL_LINK( OnTypeSelected, ListBox&, void );
+        DECL_LINK( OnOperationSelected, ListBox&, void );
     };
 
 
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index 86e048228630..b8d8a1fa7d0c 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -205,7 +205,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con
     return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,true);
 }
 
-IMPL_LINK_TYPED( ODateTimeDialog, CBClickHdl, Button*, _pBox, void )
+IMPL_LINK( ODateTimeDialog, CBClickHdl, Button*, _pBox, void )
 {
     if ( _pBox == m_pDate || _pBox == m_pTime)
     {
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 1df8dbd9268e..6a720e0fdba5 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -217,7 +217,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
 
 }
 
-IMPL_LINK_TYPED( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, void)
+IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, void)
 {
     const uno::Sequence< beans::PropertyValue > aArgs = _rAddFieldDlg.getSelectedFieldDescriptors();
     // we use this way to create undo actions
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 111f5afbb74d..c3a6b2b84c83 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -166,13 +166,13 @@ protected:
 
 private:
 
-    DECL_LINK_TYPED( DelayedPaste, void*, void );
-    DECL_LINK_TYPED( CBChangeHdl, ComboBox&, void);
+    DECL_LINK( DelayedPaste, void*, void );
+    DECL_LINK( CBChangeHdl, ComboBox&, void);
 
     void InsertRows( long nRow );
 
 public:
-    DECL_LINK_TYPED( DelayedDelete, void*, void );
+    DECL_LINK( DelayedDelete, void*, void );
 
 };
 
@@ -411,7 +411,7 @@ void OFieldExpressionControl::lateInit()
 }
 
 
-IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, CBChangeHdl, ComboBox&, void )
+IMPL_LINK_NOARG( OFieldExpressionControl, CBChangeHdl, ComboBox&, void )
 {
 
     SaveModified();
@@ -846,7 +846,7 @@ void OFieldExpressionControl::paste()
     }
 }
 
-IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void )
+IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste, void*, void )
 {
     m_nPasteEvent = nullptr;
 
@@ -857,7 +857,7 @@ IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedPaste, void*, void )
     GoToRow( nPastePosition );
 }
 
-IMPL_LINK_NOARG_TYPED( OFieldExpressionControl, DelayedDelete, void*, void )
+IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete, void*, void )
 {
     m_nDeleteEvent = nullptr;
     DeleteRows();
@@ -1092,7 +1092,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName)
     return nDataType;
 }
 
-IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void )
+IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, void )
 {
     if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() )
     {
@@ -1114,7 +1114,7 @@ IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusGot, Control&, rControl, voi
     }
 }
 
-IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, void )
+IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, void )
 {
     if (m_pFieldExpression && &rControl == m_pGroupIntervalEd)
     {
@@ -1123,7 +1123,7 @@ IMPL_LINK_TYPED(OGroupsSortingDialog, OnControlFocusLost, Control&, rControl, vo
     }
 }
 
-IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void )
+IMPL_LINK_NOARG( OGroupsSortingDialog, OnFormatAction, ToolBox*, void )
 {
 
     sal_uInt16 nCommand = m_pToolBox->GetCurItemId();
@@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG_TYPED( OGroupsSortingDialog, OnFormatAction, ToolBox*, void )
     }
 }
 
-IMPL_LINK_TYPED( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void )
+IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void )
 {
     if ( rListBox.IsValueChangedFromSaved() )
     {
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index bcb7ddd10688..2b1290c7b578 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -182,8 +182,8 @@ public:
     virtual ~NavigatorTree() override;
     virtual void dispose() override;
 
-    DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void);
-    DECL_LINK_TYPED( OnDropActionTimer, Timer*, void );
+    DECL_LINK(OnEntrySelDesel, SvTreeListBox*, void);
+    DECL_LINK( OnDropActionTimer, Timer*, void );
 
     virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) override;
 
@@ -422,7 +422,7 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel )
     }
 }
 
-IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void)
+IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer, Timer *, void)
 {
     if (--m_nTimerCounter > 0)
         return;
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void)
 }
 
 
-IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void)
+IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void)
 {
     if ( !m_pSelectionListener->locked() )
     {
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index bcc17b92b535..01461ca4949a 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -71,9 +71,9 @@ class  OAddFieldWindow  :public FloatingWindow
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer>                   m_pChangeListener;
     ::rtl::Reference< comphelper::OContainerListenerAdapter>                    m_pContainerListener;
 
-    DECL_LINK_TYPED( OnDoubleClickHdl, SvTreeListBox*, bool );
-    DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void );
-    DECL_LINK_TYPED( OnSortAction, ToolBox*, void );
+    DECL_LINK( OnDoubleClickHdl, SvTreeListBox*, bool );
+    DECL_LINK( OnSelectHdl, SvTreeListBox*, void );
+    DECL_LINK( OnSortAction, ToolBox*, void );
 
     OAddFieldWindow(const OAddFieldWindow&) = delete;
     void operator =(const OAddFieldWindow&) = delete;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index da23b9ab35cf..d1002dd26b69 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -107,7 +107,7 @@ namespace rptui
         virtual bool        PreNotify( NotifyEvent& rNEvt ) override;
 
     private:
-        DECL_LINK_TYPED( OnScroll, ScrollBar*, void );
+        DECL_LINK( OnScroll, ScrollBar*, void );
 
     private:
         /// returns the current number of conditions
diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx
index 9d38933f263c..150a80ed6744 100644
--- a/reportdesign/source/ui/inc/DateTime.hxx
+++ b/reportdesign/source/ui/inc/DateTime.hxx
@@ -70,7 +70,7 @@ class ODateTimeDialog : public ModalDialog
     */
     sal_Int32 getFormatKey(bool _bDate) const;
 
-    DECL_LINK_TYPED( CBClickHdl, Button*, void );
+    DECL_LINK( CBClickHdl, Button*, void );
     ODateTimeDialog(const ODateTimeDialog&) = delete;
     void operator =(const ODateTimeDialog&) = delete;
 
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 9f3735ec7719..6f9a4d84a412 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -76,8 +76,8 @@ namespace rptui
         bool                                m_bDeleted;
 
 
-        DECL_LINK_TYPED(MarkTimeout, Idle *, void);
-        DECL_LINK_TYPED( SplitHdl, SplitWindow*, void );
+        DECL_LINK(MarkTimeout, Idle *, void);
+        DECL_LINK( SplitHdl, SplitWindow*, void );
 
         void ImplInitSettings();
 
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index 183dc5eab160..77153a0db40d 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -58,7 +58,7 @@ class FormulaDialog : public formula::FormulaModalDialog,
 
     svl::SharedStringPool&             mrStringPool;
 
-    DECL_LINK_TYPED( OnClickHdl, OAddFieldWindow&, void );
+    DECL_LINK( OnClickHdl, OAddFieldWindow&, void );
 public:
     FormulaDialog( vcl::Window* pParent
         , const css::uno::Reference< css::lang::XMultiServiceFactory>& _xServiceFactory
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 47b0eaafe131..2da386938a4c 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -82,10 +82,10 @@ class OGroupsSortingDialog :    public FloatingWindow
     css::uno::Reference< css::container::XNameAccess >    m_xColumns;
     bool                                                  m_bReadOnly;
 private:
-    DECL_LINK_TYPED( OnControlFocusLost, Control&, void );
-    DECL_LINK_TYPED( OnControlFocusGot, Control&, void );
-    DECL_LINK_TYPED( LBChangeHdl, ListBox&, void );
-    DECL_LINK_TYPED( OnFormatAction, ToolBox*, void );
+    DECL_LINK( OnControlFocusLost, Control&, void );
+    DECL_LINK( OnControlFocusGot, Control&, void );
+    DECL_LINK( LBChangeHdl, ListBox&, void );
+    DECL_LINK( OnFormatAction, ToolBox*, void );
 
     /** returns the groups
         @return the groups which now have to check which one changes
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 9c89710141c2..c14cb0256995 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -314,9 +314,9 @@ namespace rptui
             ,const css::uno::Sequence< css::beans::PropertyValue >& _aArgs);
 
         void OnInvalidateClipboard();
-        DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void );
-        DECL_LINK_TYPED( OnExecuteReport, void*, void );
-        DECL_LINK_TYPED( OnOpenHelpAgent, void*, void );
+        DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void );
+        DECL_LINK( OnExecuteReport, void*, void );
+        DECL_LINK( OnOpenHelpAgent, void*, void );
         // all the features which should be handled by this class
         virtual void            describeSupportedFeatures() override;
         // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot.
@@ -335,8 +335,8 @@ namespace rptui
         OReportController(const OReportController&) = delete;
         OReportController& operator=(const OReportController&) = delete;
 
-        DECL_LINK_TYPED( EventLstHdl, VclWindowEvent&, void );
-        DECL_LINK_TYPED( OnCreateHdl, OAddFieldWindow&, void);
+        DECL_LINK( EventLstHdl, VclWindowEvent&, void );
+        DECL_LINK( OnCreateHdl, OAddFieldWindow&, void);
 
         DECLARE_XINTERFACE( )
         DECLARE_XTYPEPROVIDER( )
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index a0665a737444..0e1f5b37953e 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -103,7 +103,7 @@ namespace rptui
         void switchListening( const css::uno::Reference< css::container::XIndexAccess >& _rxContainer, bool _bStartListening );
         void switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening );
 
-        DECL_LINK_TYPED(SettingsChanged, VclSimpleEvent&, void );
+        DECL_LINK(SettingsChanged, VclSimpleEvent&, void );
     private:
 
         ::std::vector< css::uno::Reference< css::container::XChild> >::const_iterator getSection(const css::uno::Reference< css::container::XChild>& _xContainer) const;
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 83c39327348f..3c1d31a13cd1 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -56,7 +56,7 @@ namespace rptui
         ::rtl::Reference<comphelper::OPropertyChangeMultiplexer >
                                     m_pReportDefinitionMultiPlexer; // listener for property changes
 
-        DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void);
+        DECL_LINK( ScrollHdl, ScrollBar*, void);
         Size ResizeScrollBars();
         void ImplInitSettings();
         void impl_initScrollBar( ScrollBar& _rScrollBar ) const;
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index fbe632021050..45d342775bee 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -79,10 +79,10 @@ namespace rptui
         bool setReportSectionTitle(const css::uno::Reference< css::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< css::uno::Reference< css::report::XSection> , OReportHelper> _pGetSection, const ::std::mem_fun_t<bool, OReportHelper>& _pIsSectionOn);
         void ImplInitSettings();
 
-        DECL_LINK_TYPED(Collapsed, OColorListener&, void);
-        DECL_LINK_TYPED(StartSplitHdl, Splitter*, void);
-        DECL_LINK_TYPED(SplitHdl, Splitter*, void);
-        DECL_LINK_TYPED(EndSplitHdl, Splitter*, void);
+        DECL_LINK(Collapsed, OColorListener&, void);
+        DECL_LINK(StartSplitHdl, Splitter*, void);
+        DECL_LINK(SplitHdl, Splitter*, void);
+        DECL_LINK(EndSplitHdl, Splitter*, void);
 
 
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx
index ea529bd8d591..a75315fdd3df 100644
--- a/reportdesign/source/ui/inc/dlgedfac.hxx
+++ b/reportdesign/source/ui/inc/dlgedfac.hxx
@@ -35,7 +35,7 @@ public:
     DlgEdFactory();
     ~DlgEdFactory();
 
-    DECL_STATIC_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjCreatorParams, SdrObject* );
+    DECL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, SdrObject* );
 };
 }
 #endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DLGEDFAC_HXX
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index ec5b3c7c0cfa..ab218994a837 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -53,7 +53,7 @@ protected:
     bool            m_bUiActive;
     bool            m_bShowPropertyBrowser;
 
-    DECL_LINK_TYPED( ScrollTimeout, Timer *, void );
+    DECL_LINK( ScrollTimeout, Timer *, void );
     void    ForceScroll( const Point& rPos );
     /** checks that no other object is overlapped.
     *
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 9e8f37047af8..e205d41e19b4 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -83,7 +83,7 @@ protected:
     css::uno::Reference< css::uno::XInterface> CreateComponentPair(
              const css::uno::Reference< css::uno::XInterface>& _xFormComponent
             ,const css::uno::Reference< css::uno::XInterface>& _xReportComponent);
-    DECL_LINK_TYPED( OnAsyncGetFocus, void*, void );
+    DECL_LINK( OnAsyncGetFocus, void*, void );
 
 public:
     PropBrw(const css::uno::Reference< css::uno::XComponentContext >& _xORB
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index c5d29746411b..eb4383f9a612 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -266,7 +266,7 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
 
 }
 
-IMPL_LINK_NOARG_TYPED(ODesignView, MarkTimeout, Idle *, void)
+IMPL_LINK_NOARG(ODesignView, MarkTimeout, Idle *, void)
 {
     if ( m_pPropWin && m_pPropWin->IsVisible() )
     {
@@ -399,7 +399,7 @@ void ODesignView::ImplInitSettings()
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
 
-IMPL_LINK_NOARG_TYPED( ODesignView, SplitHdl, SplitWindow*, void )
+IMPL_LINK_NOARG( ODesignView, SplitHdl, SplitWindow*, void )
 {
     const Size aOutputSize = GetOutputSizePixel();
     const long nTest = aOutputSize.Width() * m_aSplitWin->GetItemSize(TASKPANE_ID) / 100;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index a2b6ec538c0d..453dce3c726a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -1725,12 +1725,12 @@ void OReportController::impl_initialize( )
     }
 }
 
-IMPL_LINK_NOARG_TYPED( OReportController, OnOpenHelpAgent, void*, void )
+IMPL_LINK_NOARG( OReportController, OnOpenHelpAgent, void*, void )
 {
     doOpenHelpAgent();
 }
 
-IMPL_LINK_TYPED( OReportController, OnCreateHdl, OAddFieldWindow& ,_rAddFieldDlg, void)
+IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow& ,_rAddFieldDlg, void)
 {
     WaitObject aObj( getDesignView() );
     uno::Sequence< beans::PropertyValue > aArgs = _rAddFieldDlg.getSelectedFieldDescriptors();
@@ -2317,7 +2317,7 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr
     }
 }
 
-IMPL_LINK_NOARG_TYPED(OReportController, OnClipboardChanged, TransferableDataHelper*, void)
+IMPL_LINK_NOARG(OReportController, OnClipboardChanged, TransferableDataHelper*, void)
 {
     OnInvalidateClipboard();
 }
@@ -2567,7 +2567,7 @@ sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGro
 }
 
 
-IMPL_LINK_TYPED( OReportController, EventLstHdl, VclWindowEvent&, _rEvent, void )
+IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent&, _rEvent, void )
 {
     if ( _rEvent.GetId() == VCLEVENT_WINDOW_CLOSE )
     {
@@ -3120,7 +3120,7 @@ void OReportController::createNewFunction(const uno::Any& _aValue)
     xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction));
 }
 
-IMPL_LINK_NOARG_TYPED( OReportController, OnExecuteReport, void*, void )
+IMPL_LINK_NOARG( OReportController, OnExecuteReport, void*, void )
 {
     executeReport();
 }
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 6e3dc687ba8e..748cf10d6dbf 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -80,7 +80,7 @@ public:
     }
 
 
-    IMPL_LINK_TYPED(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void)
+    IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void)
     {
             sal_Int32 nEvent = _rEvt.GetId();
 
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index bf159fb2a77b..e80990dc0d80 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -193,7 +193,7 @@ void OScrollWindowHelper::Resize()
     m_aReportWindow->SetPosSizePixel(Point( 0, 0 ),aTotalOutputSize);
 }
 
-IMPL_LINK_TYPED( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/, void )
+IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/, void )
 {
     m_aReportWindow->ScrollChildren( getThumbPos() );
 }
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 18d3a9c8afc3..c94d04032432 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -295,7 +295,7 @@ void OSectionWindow::setMarked(bool _bMark)
     m_aEndMarker->setMarked(_bMark);
 }
 
-IMPL_LINK_TYPED( OSectionWindow, Collapsed, OColorListener&, _rMarker, void )
+IMPL_LINK( OSectionWindow, Collapsed, OColorListener&, _rMarker, void )
 {
     bool bShow = !_rMarker.isCollapsed();
     m_aReportSection->Show(bShow);
@@ -316,18 +316,18 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
     Invalidate();
 }
 
-IMPL_LINK_NOARG_TYPED( OSectionWindow, StartSplitHdl, Splitter*, void)
+IMPL_LINK_NOARG( OSectionWindow, StartSplitHdl, Splitter*, void)
 {
     const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) );
     getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString(), 0, -1 );
 }
 
-IMPL_LINK_NOARG_TYPED( OSectionWindow, EndSplitHdl, Splitter*, void )
+IMPL_LINK_NOARG( OSectionWindow, EndSplitHdl, Splitter*, void )
 {
     getViewsWindow()->getView()->getReportView()->getController().getUndoManager().LeaveListAction();
 }
 
-IMPL_LINK_TYPED( OSectionWindow, SplitHdl, Splitter*, _pSplitter, void )
+IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter, void )
 {
     if ( !getViewsWindow()->getView()->getReportView()->getController().isEditable() )
     {
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 09ef7bcb341e..07a2e4c9c3d2 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -43,7 +43,7 @@ DlgEdFactory::~DlgEdFactory()
 }
 
 
-IMPL_STATIC_LINK_TYPED(
+IMPL_STATIC_LINK(
     DlgEdFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* )
 {
     SdrObject* pNewObj = nullptr;
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 45cd2e78715a..3830ff0fd290 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -60,7 +60,7 @@ namespace rptui
 using namespace ::com::sun::star;
 
 
-IMPL_LINK_NOARG_TYPED( DlgEdFunc, ScrollTimeout, Timer *, void )
+IMPL_LINK_NOARG( DlgEdFunc, ScrollTimeout, Timer *, void )
 {
     ForceScroll( m_pParent->PixelToLogic( m_pParent->GetPointerPosPixel() ) );
 }
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 594a27c627b8..7e3bb4529d2e 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -559,7 +559,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
     }
 }
 
-IMPL_LINK_NOARG_TYPED( PropBrw, OnAsyncGetFocus, void*, void )
+IMPL_LINK_NOARG( PropBrw, OnAsyncGetFocus, void*, void )
 {
     if (m_xBrowserComponentWindow.is())
         m_xBrowserComponentWindow->setFocus();