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 /basic/source/classes | |
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 'basic/source/classes')
-rw-r--r-- | basic/source/classes/sb.cxx | 6 | ||||
-rw-r--r-- | basic/source/classes/sbxmod.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index c63c03eabef5..559cb3cb36f9 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1838,17 +1838,17 @@ bool StarBASIC::ErrorHdl() return aErrorHdl.IsSet() && aErrorHdl.Call( this ); } -Link StarBASIC::GetGlobalErrorHdl() +Link<> StarBASIC::GetGlobalErrorHdl() { return GetSbData()->aErrHdl; } -void StarBASIC::SetGlobalErrorHdl( const Link& rLink ) +void StarBASIC::SetGlobalErrorHdl( const Link<>& rLink ) { GetSbData()->aErrHdl = rLink; } -void StarBASIC::SetGlobalBreakHdl( const Link& rLink ) +void StarBASIC::SetGlobalBreakHdl( const Link<>& rLink ) { GetSbData()->aBreakHdl = rLink; } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 0d4395c866ba..96b6fa4df2b2 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -1725,7 +1725,7 @@ bool SbModule::ExceedsLegacyModuleSize() class ErrorHdlResetter { - Link mErrHandler; + Link<> mErrHandler; bool mbError; public: ErrorHdlResetter() : mbError( false ) |