From 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 5 Oct 2016 07:56:12 +0200 Subject: 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 --- sc/workben/result.cxx | 2 +- sc/workben/test.cxx | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sc/workben') diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 3fd9f5538e6b..dbe30db24e91 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -47,7 +47,7 @@ void ScAddInResult::NewValue() m_Listeners[n]->modified( aEvent ); } -IMPL_LINK_TYPED( ScAddInResult, TimeoutHdl, Timer*, pT, void ) +IMPL_LINK( ScAddInResult, TimeoutHdl, Timer*, pT, void ) { NewValue(); pT->Start(); diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index a97442b182de..32581bdd8860 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -76,11 +76,11 @@ private: public: explicit MyWindow( vcl::Window *pParent ); - DECL_LINK_TYPED(CountHdl, PushButton*, void); - DECL_LINK_TYPED(TextHdl, PushButton*, void); - DECL_LINK_TYPED(BlaHdl, PushButton*, void); - DECL_LINK_TYPED(TabHdl, PushButton*, void); - DECL_LINK_TYPED(ViewHdl, PushButton*, void); + DECL_LINK(CountHdl, PushButton*, void); + DECL_LINK(TextHdl, PushButton*, void); + DECL_LINK(BlaHdl, PushButton*, void); + DECL_LINK(TabHdl, PushButton*, void); + DECL_LINK(ViewHdl, PushButton*, void); }; class ScTestListener : public XSelectionChangeListener, public UsrObject @@ -1501,7 +1501,7 @@ void lcl_Pivot( FixedText& aTimeText ) // 30 } } -IMPL_LINK_NOARG_TYPED(MyWindow, CountHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, CountHdl, PushButton*, void) { long nCount = aCountField.GetValue(); @@ -1608,7 +1608,7 @@ IMPL_LINK_NOARG_TYPED(MyWindow, CountHdl, PushButton*, void) } } -IMPL_LINK_NOARG_TYPED(MyWindow, TextHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, TextHdl, PushButton*, void) { sal_uInt16 nCol = (sal_uInt16)aColField.GetValue(); sal_uInt16 nRow = (sal_uInt16)aRowField.GetValue(); @@ -1653,7 +1653,7 @@ IMPL_LINK_NOARG_TYPED(MyWindow, TextHdl, PushButton*, void) } } -IMPL_LINK_NOARG_TYPED(MyWindow, BlaHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, BlaHdl, PushButton*, void) { aTimeText.SetText("..."); @@ -1723,7 +1723,7 @@ IMPL_LINK_NOARG_TYPED(MyWindow, BlaHdl, PushButton*, void) } } -IMPL_LINK_NOARG_TYPED(MyWindow, TabHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, TabHdl, PushButton*, void) { String aResult; @@ -1812,7 +1812,7 @@ void lcl_FillCells(XCellCollectionRef xColl) } } -IMPL_LINK_NOARG_TYPED(MyWindow, ViewHdl, PushButton*, void) +IMPL_LINK_NOARG(MyWindow, ViewHdl, PushButton*, void) { XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // calc model XInterfaceRef xInt = lcl_GetView(); -- cgit