summaryrefslogtreecommitdiff
path: root/include/svx/rubydialog.hxx
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 /include/svx/rubydialog.hxx
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 'include/svx/rubydialog.hxx')
-rw-r--r--include/svx/rubydialog.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index f77bee62b94f..7729ab54449f 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -69,8 +69,8 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow
class SvxRubyData_Impl;
class RubyEdit : public Edit
{
- Link aScrollHdl;
- Link aJumpHdl;
+ Link<> aScrollHdl;
+ Link<> aJumpHdl;
virtual void GetFocus() SAL_OVERRIDE;
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
public:
@@ -82,8 +82,8 @@ public:
: Edit(pParent, WB_BORDER)
{
}
- void SetScrollHdl(Link& rLink) {aScrollHdl = rLink;}
- void SetJumpHdl(Link& rLink) {aJumpHdl = rLink;}
+ void SetScrollHdl(Link<>& rLink) {aScrollHdl = rLink;}
+ void SetJumpHdl(Link<>& rLink) {aJumpHdl = rLink;}
};