From 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 30 Apr 2015 10:20:00 +0200 Subject: 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 --- sw/inc/doc.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/inc/doc.hxx') diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 71ab46719bcd..6daed2fb3549 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -258,7 +258,7 @@ class SW_DLLPUBLIC SwDoc : ::boost::scoped_ptr m_pNodes; //< document content (Nodes Array) SwAttrPool* mpAttrPool; //< the attribute pool SwPageDescs maPageDescs; //< PageDescriptors - Link maOle2Link; //< OLE 2.0-notification + Link<> maOle2Link; //< OLE 2.0-notification /* @@@MAINTAINABILITY-HORROR@@@ Timer should not be members of the model */ @@ -1361,8 +1361,8 @@ public: ::sw::IShellCursorSupplier * GetIShellCursorSupplier(); // OLE 2.0-notification. - inline void SetOle2Link(const Link& rLink) {maOle2Link = rLink;} - inline const Link& GetOle2Link() const {return maOle2Link;} + inline void SetOle2Link(const Link<>& rLink) {maOle2Link = rLink;} + inline const Link<>& GetOle2Link() const {return maOle2Link;} // insert section (the ODF kind of section, not the nodesarray kind) SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &, @@ -1439,7 +1439,7 @@ public: // Call into intransparent Basic / JavaScript. sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, bool bChkPtr = false, SbxArray* pArgs = 0, - const Link* pCallBack = 0 ); + const Link<>* pCallBack = 0 ); /** Adjust left margin via object bar (similar to adjustment of numerations). One can either change the margin "by" adding or subtracting a given -- cgit v1.2.3