summaryrefslogtreecommitdiff
path: root/svx/source/dialog/contwnd.hxx
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/source/dialog/contwnd.hxx
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/source/dialog/contwnd.hxx')
-rw-r--r--svx/source/dialog/contwnd.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 6937bf9fd8ab..675ffd371939 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -28,9 +28,9 @@ class ContourWindow : public GraphCtrl
tools::PolyPolygon aPolyPoly;
Color aPipetteColor;
Rectangle aWorkRect;
- Link aPipetteLink;
- Link aPipetteClickLink;
- Link aWorkplaceClickLink;
+ Link<> aPipetteLink;
+ Link<> aPipetteClickLink;
+ Link<> aWorkplaceClickLink;
bool bPipetteMode;
bool bWorkplaceMode;
bool bClickValid;
@@ -65,10 +65,10 @@ public:
bool IsWorkplaceMode() const { return bWorkplaceMode; }
const Rectangle& GetWorkRect() const { return aWorkRect; }
- void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; }
- void SetPipetteClickHdl( const Link& rLink ) { aPipetteClickLink = rLink; }
+ void SetPipetteHdl( const Link<>& rLink ) { aPipetteLink = rLink; }
+ void SetPipetteClickHdl( const Link<>& rLink ) { aPipetteClickLink = rLink; }
- void SetWorkplaceClickHdl( const Link& rLink ) { aWorkplaceClickLink = rLink; }
+ void SetWorkplaceClickHdl( const Link<>& rLink ) { aWorkplaceClickLink = rLink; }
};