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 /cui/source/inc/cfg.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 'cui/source/inc/cfg.hxx')
-rw-r--r-- | cui/source/inc/cfg.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 759b1406d3e6..3038b4b80d57 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -531,7 +531,7 @@ public: class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox { Size m_aCheckBoxImageSizePixel; - Link m_aChangedListener; + Link<> m_aChangedListener; SvLBoxButtonData* m_pButtonData; VclPtr<SvxConfigPage> pPage; @@ -551,10 +551,10 @@ public: virtual ~SvxToolbarEntriesListBox(); virtual void dispose() SAL_OVERRIDE; - void SetChangedListener( const Link& aChangedListener ) + void SetChangedListener( const Link<>& aChangedListener ) { m_aChangedListener = aChangedListener; } - const Link& GetChangedListener() const { return m_aChangedListener; } + const Link<>& GetChangedListener() const { return m_aChangedListener; } Size GetCheckBoxPixelSize() const { return m_aCheckBoxImageSizePixel; } @@ -672,7 +672,7 @@ private: VclPtr<Edit> m_pEdtName; VclPtr<OKButton> m_pBtnOK; - Link aCheckNameHdl; + Link<> aCheckNameHdl; DECL_LINK(ModifyHdl, Edit*); @@ -688,7 +688,7 @@ public: return m_pEdtName->GetText(); } - void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) + void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) { aCheckNameHdl = rLink; if ( bCheckImmediately ) |