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/labdlg.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/labdlg.hxx')
-rw-r--r-- | cui/source/inc/labdlg.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 610c63b2f2f9..7995287a00ec 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -102,7 +102,7 @@ private: sal_uInt16 m_nPositionSizePageId; sal_uInt16 m_nCaptionPageId; - Link aValidateLink; + Link<> aValidateLink; virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; @@ -111,7 +111,7 @@ public: sal_uInt16 nAnchorTypes = 0); /// link for the Writer to validate positions - void SetValidateFramePosLink( const Link& rLink ); + void SetValidateFramePosLink( const Link<>& rLink ); }; |