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/vcl/gdimtf.hxx | |
parent | writerfilter: unused fill and CT_Fill resources (diff) | |
download | core-3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed.tar.gz core-3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed.zip |
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/vcl/gdimtf.hxx')
-rw-r--r-- | include/vcl/gdimtf.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx index e860dda464b1..43bfad95a0b6 100644 --- a/include/vcl/gdimtf.hxx +++ b/include/vcl/gdimtf.hxx @@ -78,7 +78,7 @@ private: MapMode aPrefMapMode; Size aPrefSize; - Link aHookHdlLink; + Link<> aHookHdlLink; GDIMetaFile* pPrev; GDIMetaFile* pNext; VclPtr<OutputDevice> pOutDev; @@ -198,8 +198,8 @@ public: const MapMode& GetPrefMapMode() const { return aPrefMapMode; } void SetPrefMapMode( const MapMode& rMapMode ) { aPrefMapMode = rMapMode; } - void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; } - const Link& GetHookHdl() const { return aHookHdlLink; } + void SetHookHdl( const Link<>& rLink ) { aHookHdlLink = rLink; } + const Link<>& GetHookHdl() const { return aHookHdlLink; } sal_uLong GetChecksum() const; sal_uLong GetSizeBytes() const; |