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 /sc/inc/dbdata.hxx | |
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 'sc/inc/dbdata.hxx')
-rw-r--r-- | sc/inc/dbdata.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 708bd858c628..2da067aa22b8 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -214,7 +214,7 @@ public: }; private: - Link aRefreshHandler; + Link<> aRefreshHandler; ScDocument* pDoc; sal_uInt16 nEntryIndex; ///< counter for unique indices NamedDBs maNamedDBs; @@ -246,9 +246,9 @@ public: sal_uInt16 GetEntryIndex() { return nEntryIndex; } void SetEntryIndex(sal_uInt16 nInd) { nEntryIndex = nInd; } - void SetRefreshHandler( const Link& rLink ) + void SetRefreshHandler( const Link<>& rLink ) { aRefreshHandler = rLink; } - const Link& GetRefreshHandler() const { return aRefreshHandler; } + const Link<>& GetRefreshHandler() const { return aRefreshHandler; } bool empty() const; bool operator== (const ScDBCollection& r) const; |