summaryrefslogtreecommitdiffstats
path: root/include/svx/dialcontrol.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 /include/svx/dialcontrol.hxx
parentwriterfilter: unused fill and CT_Fill resources (diff)
downloadcore-3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed.tar.gz
core-3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed.zip
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 'include/svx/dialcontrol.hxx')
-rw-r--r--include/svx/dialcontrol.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 13a182da1503..ef05aa0f4503 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -113,7 +113,7 @@ public:
void SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces = 0);
/** The passed handler is called whenever the totation value changes. */
- void SetModifyHdl( const Link& rLink );
+ void SetModifyHdl( const Link<>& rLink );
/** Save value for later comparison */
void SaveValue();
@@ -127,7 +127,7 @@ protected:
ScopedVclPtr<DialControlBmp> mxBmpEnabled;
ScopedVclPtr<DialControlBmp> mxBmpDisabled;
ScopedVclPtr<DialControlBmp> mxBmpBuffered;
- Link maModifyHdl;
+ Link<> maModifyHdl;
VclPtr<NumericField> mpLinkField;
sal_Int32 mnLinkedFieldValueMultiplyer;
Size maWinSize;
@@ -156,7 +156,7 @@ protected:
private:
void InvalidateControl();
- void ImplSetFieldLink( const Link& rLink );
+ void ImplSetFieldLink( const Link<>& rLink );
DECL_LINK( LinkedFieldModifyHdl, NumericField* );