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 /extensions/source/abpilot | |
| 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 'extensions/source/abpilot')
| -rw-r--r-- | extensions/source/abpilot/abspilot.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/abpilot/typeselectionpage.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index 2617e35d7f6a..9dd84a1a0041 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -188,7 +188,7 @@ namespace abp implCleanup(); // reset the click hdl - m_pCancel->SetClickHdl( Link() ); + m_pCancel->SetClickHdl( Link<>() ); // simulate the click again - this time, the default handling of the button will strike .... m_pCancel->Click(); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index f93957962ff9..a282abe51e7c 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -133,7 +133,7 @@ namespace abp m_aAllTypes.push_back( ButtonItem( m_pOE, AST_OE, bWithMozilla ) ); m_aAllTypes.push_back( ButtonItem( m_pOther, AST_OTHER, true ) ); - Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); + Link<> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin(); loop != m_aAllTypes.end(); ++loop ) { |