diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /cui/source/inc/numfmt.hxx | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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 'cui/source/inc/numfmt.hxx')
-rw-r--r-- | cui/source/inc/numfmt.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 78ce3f200d41..dae84fea1d13 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -85,7 +85,7 @@ public: void SetNumberFormatList( const SvxNumberInfoItem& rItem ) { SetInfoItem( rItem ); } - void SetOkHdl( const Link& rOkHandler ); + void SetOkHdl( const Link<>& rOkHandler ); void HideLanguage(bool nFlag=true); virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; @@ -123,7 +123,7 @@ private: SvxNumberInfoItem* pNumItem; SvxNumberFormatShell* pNumFmtShell; sal_uLong nInitFormat; - Link fnOkHdl; + Link<> fnOkHdl; bool bNumItemFlag; ///< for handling with DocShell bool bOneAreaFlag; |