summaryrefslogtreecommitdiff
path: root/sd/source/ui/sidebar/LayoutMenu.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /sd/source/ui/sidebar/LayoutMenu.cxx
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff)
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and return types, but provide default template arguments that keep the generic, unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the Link class can be updated over time. All the related macros are duplicated with ..._TYPED counterparts, that additionally take the RetType (except for LINK_TYPED, which manages to infer the relevant types from the supplied Member). (It would have been attractive to change the "untyped" LinkStubs from taking a void* to a properly typed ArgType parameter, too, but that would cause -fsanitize=function to flag uses of "untyped" Link::Call.) Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'sd/source/ui/sidebar/LayoutMenu.cxx')
-rw-r--r--sd/source/ui/sidebar/LayoutMenu.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 65ce70fa7e04..53a66c8fa52b 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -168,7 +168,7 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
SetSelectHdl (LINK(this, LayoutMenu, ClickHandler));
InvalidateContent();
- Link aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener));
+ Link<> aEventListenerLink (LINK(this,LayoutMenu,EventMultiplexerListener));
mrBase.GetEventMultiplexer()->AddEventListener(aEventListenerLink,
::sd::tools::EventMultiplexerEvent::EID_CURRENT_PAGE
| ::sd::tools::EventMultiplexerEvent::EID_SLIDE_SORTER_SELECTION
@@ -181,14 +181,14 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell )
Window::SetHelpId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS);
SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE));
- Link aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler));
+ Link<> aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler));
mxListener = new ::sd::tools::SlotStateListener(
aStateChangeLink,
Reference<frame::XDispatchProvider>(mrBase.GetController()->getFrame(), UNO_QUERY),
".uno:VerticalTextState");
SetSizePixel(GetParent()->GetSizePixel());
- Link aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
+ Link<> aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
GetParent()->AddEventListener(aWindowEventHandlerLink);
}
@@ -218,10 +218,10 @@ void LayoutMenu::Dispose()
xComponent->dispose();
Clear();
- Link aLink (LINK(this,LayoutMenu,EventMultiplexerListener));
+ Link<> aLink (LINK(this,LayoutMenu,EventMultiplexerListener));
mrBase.GetEventMultiplexer()->RemoveEventListener (aLink);
- Link aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
+ Link<> aWindowEventHandlerLink (LINK(this,LayoutMenu,WindowEventHandler));
GetParent()->RemoveEventListener(aWindowEventHandlerLink);
}