summaryrefslogtreecommitdiff
path: root/include/basic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/basic
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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 'include/basic')
-rw-r--r--include/basic/sbstar.hxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index c0b84019e1f7..fbe8d1d4e855 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -54,8 +54,8 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
SbxArrayRef xUnoListeners; // Listener handled by CreateUnoListener
// Handler-Support:
- Link aErrorHdl; // Error handler
- Link aBreakHdl; // Breakpoint handler
+ Link<> aErrorHdl; // Error handler
+ Link<> aBreakHdl; // Breakpoint handler
bool bNoRtl; // if true: do not search RTL
bool bBreak; // if true: Break, otherwise Step
bool bDocBasic;
@@ -148,14 +148,14 @@ public:
static SbError GetSfxFromVBError( sal_uInt16 nError );
bool IsBreak() const { return bBreak; }
- static Link GetGlobalErrorHdl();
- static void SetGlobalErrorHdl( const Link& rNewHdl );
- Link GetErrorHdl() const { return aErrorHdl; }
- void SetErrorHdl( const Link& r ) { aErrorHdl = r; }
+ static Link<> GetGlobalErrorHdl();
+ static void SetGlobalErrorHdl( const Link<>& rNewHdl );
+ Link<> GetErrorHdl() const { return aErrorHdl; }
+ void SetErrorHdl( const Link<>& r ) { aErrorHdl = r; }
- static void SetGlobalBreakHdl( const Link& rNewHdl );
- Link GetBreakHdl() const { return aBreakHdl; }
- void SetBreakHdl( const Link& r ) { aBreakHdl = r; }
+ static void SetGlobalBreakHdl( const Link<>& rNewHdl );
+ Link<> GetBreakHdl() const { return aBreakHdl; }
+ void SetBreakHdl( const Link<>& r ) { aBreakHdl = r; }
SbxArrayRef getUnoListeners();