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 /include/sfx2/app.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 'include/sfx2/app.hxx')
-rw-r--r-- | include/sfx2/app.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index b9d8d8607773..cf4b02c15bbd 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -94,15 +94,15 @@ namespace sfx2 class SfxLinkItem : public SfxPoolItem { - Link aLink; + Link<> aLink; public: virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE { return new SfxLinkItem( *this ); } virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE { return static_cast<const SfxLinkItem&>(rL).aLink == aLink; } - SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) + SfxLinkItem( sal_uInt16 nWhichId, const Link<>& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } - const Link& GetValue() const { return aLink; } + const Link<>& GetValue() const { return aLink; } }; #ifndef SFX_DECL_OBJECTSHELL_DEFINED |