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 /sfx2/inc/srchdlg.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 'sfx2/inc/srchdlg.hxx')
-rw-r--r-- | sfx2/inc/srchdlg.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 2b71b76f7d99..782d75a2fe6e 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -43,8 +43,8 @@ private: VclPtr<CheckBox> m_pBackwardsBox; VclPtr<PushButton> m_pFindBtn; - Link m_aFindHdl; - Link m_aCloseHdl; + Link<> m_aFindHdl; + Link<> m_aCloseHdl; OUString m_sConfigName; OString m_sWinState; @@ -61,8 +61,8 @@ public: virtual ~SearchDialog(); virtual void dispose() SAL_OVERRIDE; - void SetFindHdl( const Link& rLink ) { m_aFindHdl = rLink; } - void SetCloseHdl( const Link& rLink ) { m_aCloseHdl = rLink; } + void SetFindHdl( const Link<>& rLink ) { m_aFindHdl = rLink; } + void SetCloseHdl( const Link<>& rLink ) { m_aCloseHdl = rLink; } OUString GetSearchText() const { return m_pSearchEdit->GetText(); } void SetSearchText( const OUString& _rText ) { m_pSearchEdit->SetText( _rText ); } |