summaryrefslogtreecommitdiff
path: root/svx/inc/svdibrow.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/inc/svdibrow.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/inc/svdibrow.hxx')
-rw-r--r--svx/inc/svdibrow.hxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index 7ce191073b55..b735152ef15d 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -36,8 +36,8 @@ friend class ImpItemEdit;
long nAktPaintRow;
VclPtr<Edit> pEditControl;
OUString aWNamMerk;
- Link aEntryChangedHdl;
- Link aSetDirtyHdl;
+ Link<> aEntryChangedHdl;
+ Link<> aSetDirtyHdl;
ImpItemListRow* pAktChangeEntry;
long nLastWhichOfs;
sal_uInt16 nLastWhich;
@@ -90,10 +90,10 @@ public:
const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
OUString GetNewEntryValue() const { return pEditControl->GetText(); }
- void SetEntryChangedHdl(const Link& rLink) { aEntryChangedHdl=rLink; }
- const Link& GetEntryChangedHdl() const { return aEntryChangedHdl; }
- void SetSetDirtyHdl(const Link& rLink) { aSetDirtyHdl=rLink; }
- const Link& GetSetDirtyHdl() const { return aSetDirtyHdl; }
+ void SetEntryChangedHdl(const Link<>& rLink) { aEntryChangedHdl=rLink; }
+ const Link<>& GetEntryChangedHdl() const { return aEntryChangedHdl; }
+ void SetSetDirtyHdl(const Link<>& rLink) { aSetDirtyHdl=rLink; }
+ const Link<>& GetSetDirtyHdl() const { return aSetDirtyHdl; }
};
#define WB_STDSIZEABLEDOCKWIN (WB_STDDOCKWIN|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEMOVE)