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/sidebar | |
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/sidebar')
-rw-r--r-- | sfx2/source/sidebar/AsynchronousCall.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/Deck.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/FocusManager.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/sidebar/TitleBar.cxx | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx index af3f9b60b406..495d62f8eb7b 100644 --- a/sfx2/source/sidebar/AsynchronousCall.cxx +++ b/sfx2/source/sidebar/AsynchronousCall.cxx @@ -57,7 +57,7 @@ void AsynchronousCall::CancelRequest() } } -IMPL_LINK_NOARG_TYPED(AsynchronousCall, HandleUserCall, void*, void ) +IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall, void*, void ) { mnCallId = nullptr; if (maAction) diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 989c9ae9b94e..15a9c3a87119 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -296,7 +296,7 @@ void Deck::PrintWindowSubTree(vcl::Window* pRoot, int nIndentation) PrintWindowSubTree(pRoot->GetChild(nIndex), nIndentation + 1); } -IMPL_LINK_NOARG_TYPED(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) +IMPL_LINK_NOARG(Deck, HandleVerticalScrollBarChange, ScrollBar*, void) { const sal_Int32 nYOffset (-mpVerticalScrollBar->GetThumbPos()); mpScrollContainer->SetPosPixel(Point(mpScrollContainer->GetPosPixel().X(), diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index b12995b0abba..1a4350830bb3 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -506,7 +506,7 @@ void FocusManager::HandleKeyEvent ( } } -IMPL_LINK_TYPED(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void) +IMPL_LINK(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void) { vcl::Window* pSource = rWindowEvent.GetWindow(); if (pSource == nullptr) @@ -535,7 +535,7 @@ IMPL_LINK_TYPED(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent } } -IMPL_LINK_TYPED(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pSource = rEvent.GetWindow(); if (pSource == nullptr) diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index efb0911563f3..56e888851929 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -859,7 +859,7 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( } } -IMPL_LINK_TYPED(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) +IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) { if (rEvent.GetWindow() == mpParentWindow) { @@ -993,7 +993,7 @@ VclPtr<PopupMenu> SidebarController::CreatePopupMenu ( return pMenu; } -IMPL_LINK_TYPED(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool) { if (pMenu == nullptr) { diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 02d91653a8da..150e9d33eaba 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -218,7 +218,7 @@ void SidebarToolBox::RegisterHandlers() } } -IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) { if (pToolBox != nullptr) { @@ -232,7 +232,7 @@ IMPL_LINK_TYPED(SidebarToolBox, DropDownClickHandler, ToolBox*, pToolBox, void) } } -IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -242,7 +242,7 @@ IMPL_LINK_TYPED(SidebarToolBox, ClickHandler, ToolBox*, pToolBox, void) xController->click(); } -IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -252,7 +252,7 @@ IMPL_LINK_TYPED(SidebarToolBox, DoubleClickHandler, ToolBox*, pToolBox, void) xController->doubleClick(); } -IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) +IMPL_LINK(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) { if (pToolBox == nullptr) return; @@ -262,7 +262,7 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void) xController->execute((sal_Int16)pToolBox->GetModifier()); } -IMPL_LINK_NOARG_TYPED(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) +IMPL_LINK_NOARG(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) { SolarMutexGuard g; diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index c16f9d190a14..0471cacf21e1 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -309,7 +309,7 @@ Image TabBar::GetItemImage(const DeckDescriptor& rDeckDescriptor) const mxFrame); } -IMPL_LINK_NOARG_TYPED(TabBar::Item, HandleClick, Button*, void) +IMPL_LINK_NOARG(TabBar::Item, HandleClick, Button*, void) { try { @@ -386,7 +386,7 @@ void TabBar::UpdateFocusManager(FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } -IMPL_LINK_NOARG_TYPED(TabBar, OnToolboxClicked, Button*, void) +IMPL_LINK_NOARG(TabBar, OnToolboxClicked, Button*, void) { if (!mpMenuButton) return; diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx index caf606b2a66a..820764330184 100644 --- a/sfx2/source/sidebar/TitleBar.cxx +++ b/sfx2/source/sidebar/TitleBar.cxx @@ -164,7 +164,7 @@ void TitleBar::PaintFocus(vcl::RenderContext& rRenderContext, const Rectangle& r rRenderContext.Pop(); } -IMPL_LINK_TYPED(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) +IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void) { (void)pToolBox; OSL_ASSERT(maToolBox.get()==pToolBox); |