summaryrefslogtreecommitdiff
path: root/svx/workben
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 /svx/workben
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 'svx/workben')
-rw-r--r--svx/workben/msview/msview.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index a0fbabb66600..434c7d2018d3 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -515,11 +515,11 @@ public:
void SetRootAtom( const Atom* pAtom );
- void SetCollapsingHdl(const Link& rNewHdl){maCollapsingHdl=rNewHdl;}
- const Link& GetCollapsingHdl() const { return maCollapsingHdl; }
+ void SetCollapsingHdl(const Link<>& rNewHdl){maCollapsingHdl=rNewHdl;}
+ const Link<>& GetCollapsingHdl() const { return maCollapsingHdl; }
- void SetExpandingHdl(const Link& rNewHdl){maExpandingHdl=rNewHdl;}
- const Link& GetExpandingHdl() const { return maExpandingHdl; }
+ void SetExpandingHdl(const Link<>& rNewHdl){maExpandingHdl=rNewHdl;}
+ const Link<>& GetExpandingHdl() const { return maExpandingHdl; }
virtual BOOL Expand( SvTreeListEntry* pParent );
virtual BOOL Collapse( SvTreeListEntry* pParent );
@@ -538,8 +538,8 @@ private:
Image maImgExpanded;
Image maImgCollapsed;
bool mbRecursiveGuard;
- Link maCollapsingHdl;
- Link maExpandingHdl;
+ Link<> maCollapsingHdl;
+ Link<> maExpandingHdl;
};
typedef std::pair< AtomContainerTreeListBox*, SvTreeListEntry* > AtomContainerEntryPair;