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 /svl | |
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 'svl')
-rw-r--r-- | svl/source/misc/urihelper.cxx | 8 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 06936b8bc76f..7103dc8a1c1b 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star; OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, OUString const & rTheRelURIRef, - Link const & rMaybeFileHdl, + Link<> const & rMaybeFileHdl, bool bCheckFileExists, bool bIgnoreFragment, INetURLObject::EncodeMechanism eEncodeMechanism, @@ -101,14 +101,14 @@ OUString URIHelper::SmartRel2Abs(INetURLObject const & rTheBaseURIRef, return aAbsURIRef.GetMainURL(eDecodeMechanism, eCharset); } -namespace { struct MaybeFileHdl : public rtl::Static< Link, MaybeFileHdl > {}; } +namespace { struct MaybeFileHdl : public rtl::Static< Link<>, MaybeFileHdl > {}; } -void URIHelper::SetMaybeFileHdl(Link const & rTheMaybeFileHdl) +void URIHelper::SetMaybeFileHdl(Link<> const & rTheMaybeFileHdl) { MaybeFileHdl::get() = rTheMaybeFileHdl; } -Link URIHelper::GetMaybeFileHdl() +Link<> URIHelper::GetMaybeFileHdl() { return MaybeFileHdl::get(); } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index d4073ac8b0b2..df271c31dd42 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -317,7 +317,7 @@ SvNumberFormatterRegistry_Impl& SvNumberFormatter::GetFormatterRegistry() return *pFormatterRegistry; } -void SvNumberFormatter::SetColorLink( const Link& rColorTableCallBack ) +void SvNumberFormatter::SetColorLink( const Link<>& rColorTableCallBack ) { aColorLink = rColorTableCallBack; } |