summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/itemwin.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 /svx/source/tbxctrls/itemwin.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 'svx/source/tbxctrls/itemwin.cxx')
-rw-r--r--svx/source/tbxctrls/itemwin.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 09008172a790..c212d634234f 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -452,11 +452,11 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
{
case KEY_RETURN:
nHandled = true;
- ( (Link&)GetSelectHdl() ).Call( this );
+ ( (Link<>&)GetSelectHdl() ).Call( this );
break;
case KEY_TAB:
bRelease = false;
- ( (Link&)GetSelectHdl() ).Call( this );
+ ( (Link<>&)GetSelectHdl() ).Call( this );
bRelease = true;
break;
@@ -524,7 +524,7 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
switch ( pKEvt->GetKeyCode().GetCode() )
{
case KEY_RETURN:
- ( (Link&)GetSelectHdl() ).Call( this );
+ ( (Link<>&)GetSelectHdl() ).Call( this );
nHandled = true;
break;
case KEY_TAB: