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

12 files changed, 84 insertions, 84 deletions

diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx
index 9bef86d3a562..15ca546b9e37 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -125,7 +125,7 @@ public:
 
     Size GetOptimalSize() const override;
 
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
     void DoScroll(long nDelta);
 
     void SetSelectHdl(const Link<SmElement&,void>& rLink) { maSelectHdlLink = rLink; }
@@ -143,8 +143,8 @@ class SmElementsDockingWindow : public SfxDockingWindow
     virtual void Resize() override;
     SmViewShell* GetView();
 
-    DECL_LINK_TYPED(SelectClickHandler, SmElement&, void);
-    DECL_LINK_TYPED(ElementSelectedHandle, ListBox&, void);
+    DECL_LINK(SelectClickHandler, SmElement&, void);
+    DECL_LINK(ElementSelectedHandle, ListBox&, void);
 
 public:
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 4c15ed3d8399..f5a5621980dc 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -63,7 +63,7 @@ class SmPrintOptionsTabPage : public SfxTabPage
     VclPtr<CheckBox>       m_pSaveOnlyUsedSymbols;
     VclPtr<CheckBox>       m_pAutoCloseBrackets;
 
-    DECL_LINK_TYPED(SizeButtonClickHdl, Button *, void);
+    DECL_LINK(SizeButtonClickHdl, Button *, void);
 
     virtual bool    FillItemSet(SfxItemSet* rSet) override;
     virtual void    Reset(const SfxItemSet* rSet) override;
@@ -103,9 +103,9 @@ class SmFontDialog : public ModalDialog
 
     vcl::Font maFont;
 
-    DECL_LINK_TYPED(FontSelectHdl, ComboBox&, void);
-    DECL_LINK_TYPED(FontModifyHdl, Edit&, void);
-    DECL_LINK_TYPED(AttrChangeHdl, Button *, void);
+    DECL_LINK(FontSelectHdl, ComboBox&, void);
+    DECL_LINK(FontModifyHdl, Edit&, void);
+    DECL_LINK(AttrChangeHdl, Button *, void);
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
 
@@ -133,7 +133,7 @@ class SmFontSizeDialog : public ModalDialog
     VclPtr<MetricField> m_pBorderSize;
     VclPtr<PushButton> m_pDefaultButton;
 
-    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
+    DECL_LINK(DefaultButtonClickHdl, Button *, void);
 
 public:
     SmFontSizeDialog(vcl::Window *pParent);
@@ -160,8 +160,8 @@ class SmFontTypeDialog : public ModalDialog
 
     VclPtr<OutputDevice> pFontListDev;
 
-    DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
-    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
+    DECL_LINK(MenuSelectHdl, Menu *, bool);
+    DECL_LINK(DefaultButtonClickHdl, Button *, void);
 
 public:
     SmFontTypeDialog(vcl::Window *pParent, OutputDevice *pFntListDevice);
@@ -223,10 +223,10 @@ class SmDistanceDialog : public ModalDialog
     sal_uInt16          nActiveCategory;
     bool            bScaleAllBrackets;
 
-    DECL_LINK_TYPED(GetFocusHdl, Control&, void);
-    DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
-    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
-    DECL_LINK_TYPED(CheckBoxClickHdl, Button *, void);
+    DECL_LINK(GetFocusHdl, Control&, void);
+    DECL_LINK(MenuSelectHdl, Menu *, bool);
+    DECL_LINK(DefaultButtonClickHdl, Button *, void);
+    DECL_LINK(CheckBoxClickHdl, Button *, void);
 
     using   Window::SetHelpId;
     static void SetHelpId(MetricField &rField, const OString& sHelpId);
@@ -255,7 +255,7 @@ class SmAlignDialog : public ModalDialog
     VclPtr<RadioButton> m_pRight;
     VclPtr<PushButton>  m_pDefaultButton;
 
-    DECL_LINK_TYPED(DefaultButtonClickHdl, Button *, void);
+    DECL_LINK(DefaultButtonClickHdl, Button *, void);
 
 public:
     SmAlignDialog(vcl::Window *pParent);
@@ -288,7 +288,7 @@ class SmShowSymbolSetWindow : public Control
     virtual void    Resize() override;
     virtual Size    GetOptimalSize() const override;
 
-    DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void );
+    DECL_LINK( ScrollHdl, ScrollBar*, void );
 public:
     SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle);
     virtual ~SmShowSymbolSetWindow() override;
@@ -361,12 +361,12 @@ class SmSymbolDialog : public ModalDialog
 
     VclPtr<OutputDevice> pFontListDev;
 
-    DECL_LINK_TYPED(SymbolSetChangeHdl, ListBox&, void);
-    DECL_LINK_TYPED(SymbolChangeHdl, SmShowSymbolSetWindow&, void);
-    DECL_LINK_TYPED(SymbolDblClickHdl, SmShowSymbol&, void);
-    DECL_LINK_TYPED(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void);
-    DECL_LINK_TYPED(EditClickHdl, Button*, void);
-    DECL_LINK_TYPED(GetClickHdl, Button*, void);
+    DECL_LINK(SymbolSetChangeHdl, ListBox&, void);
+    DECL_LINK(SymbolChangeHdl, SmShowSymbolSetWindow&, void);
+    DECL_LINK(SymbolDblClickHdl, SmShowSymbol&, void);
+    DECL_LINK(SymbolDblClickHdl2, SmShowSymbolSetWindow&, void);
+    DECL_LINK(EditClickHdl, Button*, void);
+    DECL_LINK(GetClickHdl, Button*, void);
     void SymbolDblClickHdl();
 
     void            FillSymbolSets();
@@ -429,16 +429,16 @@ class SmSymDefineDialog : public ModalDialog
     std::unique_ptr<SubsetMap> pSubsetMap;
     FontList           *pFontList;
 
-    DECL_LINK_TYPED(OldSymbolChangeHdl, ComboBox&, void);
-    DECL_LINK_TYPED(OldSymbolSetChangeHdl, ComboBox&, void);
-    DECL_LINK_TYPED(ModifyHdl, Edit&, void);
-    DECL_LINK_TYPED(FontChangeHdl, ListBox&, void);
-    DECL_LINK_TYPED(SubsetChangeHdl, ListBox&, void);
-    DECL_LINK_TYPED(StyleChangeHdl, ComboBox&, void);
-    DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void);
-    DECL_LINK_TYPED(AddClickHdl, Button *, void);
-    DECL_LINK_TYPED(ChangeClickHdl, Button *, void);
-    DECL_LINK_TYPED(DeleteClickHdl, Button *, void);
+    DECL_LINK(OldSymbolChangeHdl, ComboBox&, void);
+    DECL_LINK(OldSymbolSetChangeHdl, ComboBox&, void);
+    DECL_LINK(ModifyHdl, Edit&, void);
+    DECL_LINK(FontChangeHdl, ListBox&, void);
+    DECL_LINK(SubsetChangeHdl, ListBox&, void);
+    DECL_LINK(StyleChangeHdl, ComboBox&, void);
+    DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void);
+    DECL_LINK(AddClickHdl, Button *, void);
+    DECL_LINK(ChangeClickHdl, Button *, void);
+    DECL_LINK(DeleteClickHdl, Button *, void);
 
     void    FillSymbols(ComboBox &rComboBox, bool bDeleteText = true);
     void    FillSymbolSets(ComboBox &rComboBox, bool bDeleteText = true);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 8c17451eac64..450c310ad8b3 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -58,9 +58,9 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
     virtual void KeyInput(const KeyEvent& rKEvt) override;
     virtual void Command(const CommandEvent& rCEvt) override;
 
-    DECL_LINK_TYPED(MenuSelectHdl, Menu *, bool);
-    DECL_LINK_TYPED(ModifyTimerHdl, Idle *, void);
-    DECL_LINK_TYPED(CursorMoveTimerHdl, Idle *, void);
+    DECL_LINK(MenuSelectHdl, Menu *, bool);
+    DECL_LINK(ModifyTimerHdl, Idle *, void);
+    DECL_LINK(CursorMoveTimerHdl, Idle *, void);
 
     virtual void DataChanged( const DataChangedEvent& ) override;
     virtual void Resize() override;
@@ -72,8 +72,8 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper
     virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
     virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
 
-    DECL_LINK_TYPED(EditStatusHdl, EditStatus&, void);
-    DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void);
+    DECL_LINK(EditStatusHdl, EditStatus&, void);
+    DECL_LINK(ScrollHdl, ScrollBar*, void);
 
     void CreateEditView();
     Rectangle AdjustScrollBars();
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index c0524ed391fd..be4c84db6062 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -140,7 +140,7 @@ public:
 class SmFontPickListBox : public SmFontPickList, public ListBox
 {
 protected:
-    DECL_LINK_TYPED(SelectHdl, ListBox&, void);
+    DECL_LINK(SelectHdl, ListBox&, void);
 
 public:
     SmFontPickListBox(vcl::Window* pParent, WinBits nBits);
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 7c1af55e35d0..d17919eddc38 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -92,7 +92,7 @@ protected:
 
 private:
     void RepaintViewShellDoc();
-    DECL_LINK_TYPED(CaretBlinkTimerHdl, Timer *, void);
+    DECL_LINK(CaretBlinkTimerHdl, Timer *, void);
     void CaretBlinkInit();
     void CaretBlinkStart();
     void CaretBlinkStop();
@@ -171,7 +171,7 @@ class SmCmdBoxWindow : public SfxDockingWindow
 
     Timer               aInitialFocusTimer;
 
-    DECL_LINK_TYPED(InitialFocusTimerHdl, Timer *, void);
+    DECL_LINK(InitialFocusTimerHdl, Timer *, void);
 
 protected:
 
@@ -232,7 +232,7 @@ class SmViewShell: public SfxViewShell
 
     bool bPasteState;
 
-    DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void );
+    DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void );
     virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
     /** Used to determine whether insertions using SID_INSERTSYMBOL and SID_INSERTCOMMAND
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index adba7e19fbcb..1f4ef1f39c08 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -486,7 +486,7 @@ void SmElementsControl::MouseButtonDown(const MouseEvent& rMouseEvent)
     }
 }
 
-IMPL_LINK_NOARG_TYPED( SmElementsControl, ScrollHdl, ScrollBar*, void )
+IMPL_LINK_NOARG( SmElementsControl, ScrollHdl, ScrollBar*, void )
 {
     DoScroll(mxScroll->GetDelta());
 }
@@ -760,7 +760,7 @@ void SmElementsDockingWindow::EndDocking( const Rectangle& rReactangle, bool bFl
     mpElementsControl->setVerticalMode(bVertical);
 }
 
-IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void)
+IMPL_LINK(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElement, void)
 {
     SmViewShell* pViewSh = GetView();
 
@@ -772,7 +772,7 @@ IMPL_LINK_TYPED(SmElementsDockingWindow, SelectClickHandler, SmElement&, rElemen
     }
 }
 
-IMPL_LINK_TYPED( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void)
+IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void)
 {
     for (sal_uInt16 aCurrentCategory : aCategories)
     {
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index fc3a9444b85a..5883f3c594df 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -937,7 +937,7 @@ SmTextForwarder::~SmTextForwarder()
         pEditEngine->SetNotifyHdl( Link<EENotify&,void>() );
 }
 
-IMPL_LINK_TYPED(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void)
+IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify&, rNotify, void)
 {
     ::std::unique_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( &rNotify );
     if (aHint.get())
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index de257aa004cb..657838fd0767 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -181,7 +181,7 @@ class SmTextForwarder :     /* analog to SvxEditEngineForwarder */
     SmEditAccessible &  rEditAcc;
     SmEditSource &      rEditSource;
 
-    DECL_LINK_TYPED( NotifyHdl, EENotify&, void );
+    DECL_LINK( NotifyHdl, EENotify&, void );
 
     SmTextForwarder( const SmTextForwarder & ) = delete;
     SmTextForwarder & operator = ( const SmTextForwarder & ) = delete;
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4b999962aff7..73bc61fb074f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -159,7 +159,7 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont)
     rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL);
 }
 
-IMPL_LINK_NOARG_TYPED( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void )
 {
     m_pZoom->Enable(m_pSizeZoomed->IsChecked());
 }
@@ -299,13 +299,13 @@ void SmShowFont::SetFont(const vcl::Font& rFont)
     Invalidate();
 }
 
-IMPL_LINK_TYPED( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmFontDialog, FontSelectHdl, ComboBox&, rComboBox, void )
 {
     maFont.SetFamilyName(rComboBox.GetText());
     m_pShowFont->SetFont(maFont);
 }
 
-IMPL_LINK_TYPED( SmFontDialog, FontModifyHdl, Edit&, rEdit, void )
+IMPL_LINK( SmFontDialog, FontModifyHdl, Edit&, rEdit, void )
 {
     ComboBox& rComboBox = static_cast<ComboBox&>(rEdit);
     // if font is available in list then use it
@@ -316,7 +316,7 @@ IMPL_LINK_TYPED( SmFontDialog, FontModifyHdl, Edit&, rEdit, void )
     }
 }
 
-IMPL_LINK_NOARG_TYPED( SmFontDialog, AttrChangeHdl, Button*, void )
+IMPL_LINK_NOARG( SmFontDialog, AttrChangeHdl, Button*, void )
 {
     if (m_pBoldCheckBox->IsChecked())
         maFont.SetWeight(FontWeight(WEIGHT_BOLD));
@@ -421,7 +421,7 @@ public:
     }
 };
 
-IMPL_LINK_NOARG_TYPED( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmFontSizeDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
     {
@@ -495,7 +495,7 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
     rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SmFontPickListBox *pActiveListBox;
 
@@ -523,7 +523,7 @@ IMPL_LINK_TYPED( SmFontTypeDialog, MenuSelectHdl, Menu *, pMenu, bool )
     return false;
 }
 
-IMPL_LINK_NOARG_TYPED( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmFontTypeDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
     {
@@ -692,7 +692,7 @@ SmCategoryDesc::~SmCategoryDesc()
 
 /**************************************************************************/
 
-IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void )
+IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control&, rControl, void )
 {
     if (Categories[nActiveCategory])
     {
@@ -712,14 +712,14 @@ IMPL_LINK_TYPED( SmDistanceDialog, GetFocusHdl, Control&, rControl, void )
     }
 }
 
-IMPL_LINK_TYPED( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SmDistanceDialog, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SetCategory(pMenu->GetCurItemId() - 1);
     return false;
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
     {
@@ -730,7 +730,7 @@ IMPL_LINK_NOARG_TYPED( SmDistanceDialog, DefaultButtonClickHdl, Button *, void )
     }
 }
 
-IMPL_LINK_TYPED( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void )
+IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, Button *, pCheckBox, void )
 {
     if (pCheckBox == m_pCheckBox1)
     {
@@ -1018,7 +1018,7 @@ void SmDistanceDialog::WriteTo(SmFormat &rFormat) /*const*/
     rFormat.RequestApplyChanges();
 }
 
-IMPL_LINK_NOARG_TYPED( SmAlignDialog, DefaultButtonClickHdl, Button *, void )
+IMPL_LINK_NOARG( SmAlignDialog, DefaultButtonClickHdl, Button *, void )
 {
     if (ScopedVclPtrInstance<SaveDefaultsQuery>(this)->Execute() == RET_YES)
     {
@@ -1351,7 +1351,7 @@ void SmShowSymbolSetWindow::Resize()
     calccols();
 }
 
-IMPL_LINK_TYPED( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void)
+IMPL_LINK( SmShowSymbolSetWindow, ScrollHdl, ScrollBar*, /*pScrollBar*/, void)
 {
     Invalidate();
 }
@@ -1445,18 +1445,18 @@ void SmSymbolDialog::FillSymbolSets()
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void )
 {
     SelectSymbolSet(m_pSymbolSets->GetSelectEntry());
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolChangeHdl, SmShowSymbolSetWindow&, void )
 {
     SelectSymbol(m_pSymbolSetDisplay->GetSelectSymbol());
 }
 
-IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
+IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl, Button*, void)
 {
     ScopedVclPtrInstance<SmSymDefineDialog> pDialog(this, pFontListDev, rSymbolMgr);
 
@@ -1497,11 +1497,11 @@ IMPL_LINK_NOARG_TYPED(SmSymbolDialog, EditClickHdl, Button*, void)
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl2, SmShowSymbolSetWindow&, void )
 {
     SymbolDblClickHdl();
 }
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void )
+IMPL_LINK_NOARG( SmSymbolDialog, SymbolDblClickHdl, SmShowSymbol&, void )
 {
     SymbolDblClickHdl();
 }
@@ -1512,7 +1512,7 @@ void SmSymbolDialog::SymbolDblClickHdl()
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmSymbolDialog, GetClickHdl, Button*, void )
+IMPL_LINK_NOARG( SmSymbolDialog, GetClickHdl, Button*, void )
 {
     const SmSym *pSym = GetSymbol();
     if (pSym)
@@ -1773,7 +1773,7 @@ SmSym * SmSymDefineDialog::GetSymbol(const ComboBox &rComboBox)
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, void )
 {
     (void) rComboBox;
     assert(&rComboBox == pOldSymbols && "Sm : wrong argument");
@@ -1781,7 +1781,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolChangeHdl, ComboBox&, rComboBox, vo
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox, void )
 {
     (void) rComboBox;
     assert(&rComboBox == pOldSymbolSets && "Sm : wrong argument");
@@ -1789,7 +1789,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, OldSymbolSetChangeHdl, ComboBox&, rComboBox,
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void )
+IMPL_LINK( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void )
 {
     ComboBox& rComboBox = static_cast<ComboBox&>(rEdit);
     // remember cursor position for later restoring of it
@@ -1816,7 +1816,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, ModifyHdl, Edit&, rEdit, void )
     UpdateButtons();
 }
 
-IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void )
+IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void )
 {
     (void) rListBox;
     assert(&rListBox == pFonts && "Sm : wrong argument");
@@ -1825,7 +1825,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
+IMPL_LINK_NOARG( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
 {
     sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos();
     if (LISTBOX_ENTRY_NOTFOUND != nPos)
@@ -1839,7 +1839,7 @@ IMPL_LINK_NOARG_TYPED( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void )
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
+IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
 {
     (void) rComboBox;
     assert(&rComboBox == pStyles && "Sm : falsches Argument");
@@ -1848,7 +1848,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, StyleChangeHdl, ComboBox&, rComboBox, void )
 }
 
 
-IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void)
+IMPL_LINK_NOARG(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void)
 {
    sal_UCS4 cChar = pCharsetDisplay->GetSelectCharacter();
 
@@ -1876,7 +1876,7 @@ IMPL_LINK_NOARG_TYPED(SmSymDefineDialog, CharHighlightHdl, SvxShowCharSet*, void
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
+IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
 {
     (void) pButton;
     assert(pButton == pAddBtn && "Sm : wrong argument");
@@ -1903,7 +1903,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, AddClickHdl, Button *, pButton, void )
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
+IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
 {
     (void) pButton;
     assert(pButton == pChangeBtn && "Sm : wrong argument");
@@ -1940,7 +1940,7 @@ IMPL_LINK_TYPED( SmSymDefineDialog, ChangeClickHdl, Button *, pButton, void )
 }
 
 
-IMPL_LINK_TYPED( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void )
+IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton, void )
 {
     (void) pButton;
     assert(pButton == pDeleteBtn && "Sm : wrong argument");
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 3cf5b1681407..109ad5ed819a 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -251,13 +251,13 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
     Resize();
 }
 
-IMPL_LINK_NOARG_TYPED( SmEditWindow, ModifyTimerHdl, Idle *, void )
+IMPL_LINK_NOARG( SmEditWindow, ModifyTimerHdl, Idle *, void )
 {
     UpdateStatus(false);
     aModifyIdle.Stop();
 }
 
-IMPL_LINK_NOARG_TYPED(SmEditWindow, CursorMoveTimerHdl, Idle *, void)
+IMPL_LINK_NOARG(SmEditWindow, CursorMoveTimerHdl, Idle *, void)
     // every once in a while check cursor position (selection) of edit
     // window and if it has changed (try to) set the formula-cursor
     // according to that.
@@ -403,7 +403,7 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent &rCEvt )
 }
 
 
-IMPL_LINK_TYPED( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
+IMPL_LINK( SmEditWindow, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SmViewShell *pViewSh = rCmdBox.GetView();
     if (pViewSh)
@@ -579,13 +579,13 @@ void SmEditWindow::CreateEditView()
 }
 
 
-IMPL_LINK_NOARG_TYPED( SmEditWindow, EditStatusHdl, EditStatus&, void )
+IMPL_LINK_NOARG( SmEditWindow, EditStatusHdl, EditStatus&, void )
 {
     if (pEditView)
         Resize();
 }
 
-IMPL_LINK_TYPED( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void )
+IMPL_LINK( SmEditWindow, ScrollHdl, ScrollBar *, /*pScrollBar*/, void )
 {
     OSL_ENSURE(pEditView, "EditView missing");
     if (pEditView)
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 6072c8fa213f..34a4de5b0015 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -130,7 +130,7 @@ SmFontPickListBox::SmFontPickListBox (vcl::Window* pParent, WinBits nBits) :
     SetSelectHdl(LINK(this, SmFontPickListBox, SelectHdl));
 }
 
-IMPL_LINK_NOARG_TYPED( SmFontPickListBox, SelectHdl, ListBox&, void )
+IMPL_LINK_NOARG( SmFontPickListBox, SelectHdl, ListBox&, void )
 {
     OUString aString;
 
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 03d8d403adaf..a2f7fa8b2814 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -257,7 +257,7 @@ void SmGraphicWindow::RepaintViewShellDoc()
         pDoc->Repaint();
 }
 
-IMPL_LINK_NOARG_TYPED(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void)
+IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void)
 {
     if (IsCursorVisible())
         SetIsCursorVisible(false);
@@ -780,7 +780,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange )
     SfxDockingWindow::StateChanged( nStateChange );
 }
 
-IMPL_LINK_NOARG_TYPED( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void )
+IMPL_LINK_NOARG( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void )
 {
     // We want to have the focus in the edit window once Math has been opened
     // to allow for immediate typing.
@@ -2009,7 +2009,7 @@ void SmViewShell::Activate( bool bIsMDIActivate )
     }
 }
 
-IMPL_LINK_TYPED( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void )
+IMPL_LINK( SmViewShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void )
 {
     assert(_pFileDlg && "SmViewShell::DialogClosedHdl(): no file dialog");
     assert(pImpl->pDocInserter && "ScDocShell::DialogClosedHdl(): no document inserter");