diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /include/vcl/field.hxx | |
parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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 'include/vcl/field.hxx')
-rw-r--r-- | include/vcl/field.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index cdc80d9cd31c..dc461b781771 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -43,7 +43,7 @@ class VCL_DLLPUBLIC FormatterBase private: VclPtr<Edit> mpField; LocaleDataWrapper* mpLocaleDataWrapper; - Link maErrorLink; + Link<> maErrorLink; bool mbReformat; bool mbStrictFormat; bool mbEmptyFieldValue; @@ -83,8 +83,8 @@ public: const AllSettings& GetFieldSettings() const; - void SetErrorHdl( const Link& rLink ) { maErrorLink = rLink; } - const Link& GetErrorHdl() const { return maErrorLink; } + void SetErrorHdl( const Link<>& rLink ) { maErrorLink = rLink; } + const Link<>& GetErrorHdl() const { return maErrorLink; } void SetEmptyFieldValue(); bool IsEmptyFieldValue() const; @@ -229,7 +229,7 @@ protected: OUString maCurUnitText; sal_Int64 mnBaseValue; FieldUnit meUnit; - Link maCustomConvertLink; + Link<> maCustomConvertLink; protected: MetricFormatter(); @@ -270,8 +270,8 @@ public: using NumericFormatter::GetCorrectedValue; sal_Int64 GetCorrectedValue( FieldUnit eOutUnit ) const; - void SetCustomConvertHdl( const Link& rLink ) { maCustomConvertLink = rLink; } - const Link& GetCustomConvertHdl() const { return maCustomConvertLink; } + void SetCustomConvertHdl( const Link<>& rLink ) { maCustomConvertLink = rLink; } + const Link<>& GetCustomConvertHdl() const { return maCustomConvertLink; } }; |