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 /svx/source/dialog/dialcontrol.cxx | |
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 'svx/source/dialog/dialcontrol.cxx')
-rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 7900913aacaa..d25f61f46b8b 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -396,7 +396,7 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces mpImpl->mnLinkedFieldValueMultiplyer = 100 / std::pow(10.0, double(nDecimalPlaces)); // remove modify handler from old linked field - ImplSetFieldLink( Link() ); + ImplSetFieldLink( Link<>() ); // remember the new linked field mpImpl->mpLinkField = pField; // set modify handler at new linked field @@ -413,7 +413,7 @@ bool DialControl::IsValueModified() return mpImpl->mnInitialAngle != mpImpl->mnAngle; } -void DialControl::SetModifyHdl( const Link& rLink ) +void DialControl::SetModifyHdl( const Link<>& rLink ) { mpImpl->maModifyHdl = rLink; } @@ -465,7 +465,7 @@ void DialControl::SetRotation( sal_Int32 nAngle, bool bBroadcast ) } } -void DialControl::ImplSetFieldLink( const Link& rLink ) +void DialControl::ImplSetFieldLink( const Link<>& rLink ) { if( mpImpl->mpLinkField ) { |