diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /sfx2/source/control | |
parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) |
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
Diffstat (limited to 'sfx2/source/control')
-rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/emojicontrol.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/itemdel.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/recentdocsview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatedefaultview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatelocalview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/templatesearchview.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 61d1630ccca2..c418d0795445 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1436,7 +1436,7 @@ void SfxBindings::UpdateControllers_Impl } } -IMPL_LINK_TYPED( SfxBindings, NextJob, Timer *, pTimer, void ) +IMPL_LINK( SfxBindings, NextJob, Timer *, pTimer, void ) { NextJob_Impl(pTimer); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 4b57f14956fe..9aee901870cd 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -611,7 +611,7 @@ void SfxDispatcher::Pop(SfxShell& rShell, SfxDispatcherPopFlags nMode) It flushes the Stack, if it is dirty, thus it actually executes the pending Push and Pop commands. */ -IMPL_LINK_NOARG_TYPED( SfxDispatcher, EventHdl_Impl, Idle *, void ) +IMPL_LINK_NOARG( SfxDispatcher, EventHdl_Impl, Idle *, void ) { Flush(); Update_Impl(); @@ -1174,7 +1174,7 @@ const SfxPoolItem* SfxDispatcher::ExecuteList(sal_uInt16 nSlot, SfxCallMode eCal /** Helper method to receive the asynchronously executed <SfxRequest>s. */ -IMPL_LINK_TYPED(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) +IMPL_LINK(SfxDispatcher, PostMsgHandler, SfxRequest*, pReq, void) { DBG_ASSERT( !xImp->bFlushing, "recursive call to dispatcher" ); SFX_STACK(SfxDispatcher::PostMsgHandler); diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index 79bda2b639d3..dc66b1fbecd7 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -148,12 +148,12 @@ FILTER_CATEGORY SfxEmojiControl::getCurrentFilter() return FILTER_CATEGORY::PEOPLE; } -IMPL_LINK_NOARG_TYPED(SfxEmojiControl, ActivatePageHdl, TabControl*, void) +IMPL_LINK_NOARG(SfxEmojiControl, ActivatePageHdl, TabControl*, void) { mpEmojiView->filterItems(ViewFilter_Category(getCurrentFilter())); } -IMPL_STATIC_LINK_TYPED(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) +IMPL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, pItem, void) { OUStringBuffer sHexText = ""; sHexText.appendUtf32(OUString(pItem->getTitle()).toUInt32(16)); diff --git a/sfx2/source/control/itemdel.cxx b/sfx2/source/control/itemdel.cxx index 096ab3752864..a1d6478a45fd 100644 --- a/sfx2/source/control/itemdel.cxx +++ b/sfx2/source/control/itemdel.cxx @@ -30,7 +30,7 @@ class SfxItemDisruptor_Impl Idle m_Idle; private: - DECL_LINK_TYPED( Delete, Idle*, void ); + DECL_LINK( Delete, Idle*, void ); public: explicit SfxItemDisruptor_Impl(SfxPoolItem *pItemToDesrupt); @@ -66,7 +66,7 @@ SfxItemDisruptor_Impl::~SfxItemDisruptor_Impl() delete pItem; } -IMPL_LINK_NOARG_TYPED(SfxItemDisruptor_Impl, Delete, Idle*, void) +IMPL_LINK_NOARG(SfxItemDisruptor_Impl, Delete, Idle*, void) { delete this; } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 8dfa4e545669..e58003efb844 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -324,7 +324,7 @@ void RecentDocsView::Clear() ThumbnailView::Clear(); } -IMPL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, void*, p, void ) { LoadRecentFile* pLoadRecentFile = static_cast< LoadRecentFile*>(p); try diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx index 1f6917735d56..5e2d0fcf00eb 100644 --- a/sfx2/source/control/templatedefaultview.cxx +++ b/sfx2/source/control/templatedefaultview.cxx @@ -73,7 +73,7 @@ void TemplateDefaultView::createContextMenu() Invalidate(); } -IMPL_LINK_TYPED(TemplateDefaultView, ContextMenuSelectHdl, Menu*, pMenu, void) +IMPL_LINK(TemplateDefaultView, ContextMenuSelectHdl, Menu*, pMenu, void) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx index 758ce118bac2..f60a4803a78c 100644 --- a/sfx2/source/control/templatelocalview.cxx +++ b/sfx2/source/control/templatelocalview.cxx @@ -254,7 +254,7 @@ void TemplateLocalView::createContextMenu(const bool bIsDefault) Invalidate(); } -IMPL_LINK_TYPED(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(TemplateLocalView, ContextMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx index 1f3fc76ee469..e1db4e53c65f 100644 --- a/sfx2/source/control/templatesearchview.cxx +++ b/sfx2/source/control/templatesearchview.cxx @@ -144,7 +144,7 @@ void TemplateSearchView::createContextMenu( const bool bIsDefault) Invalidate(); } -IMPL_LINK_TYPED(TemplateSearchView, ContextMenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK(TemplateSearchView, ContextMenuSelectHdl, Menu*, pMenu, bool) { sal_uInt16 nMenuId = pMenu->GetCurItemId(); diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 716883c47825..68e88bae79cc 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -493,7 +493,7 @@ bool ThumbnailView::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK_TYPED( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ThumbnailView,ImplScrollHdl, ScrollBar*, pScrollBar, void ) { if ( pScrollBar->GetDelta() ) { |