diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-15 13:16:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:54 +0200 |
| commit | 1323f9ff9b2bbe07ce107e0c7c2559274d56e020 (patch) | |
| tree | 15ee4eafeca9683669ece6c5de113ac5b4afba1c /sfx2 | |
| parent | remove unused Link<> fields (diff) | |
| download | core-1323f9ff9b2bbe07ce107e0c7c2559274d56e020.tar.gz core-1323f9ff9b2bbe07ce107e0c7c2559274d56e020.zip | |
convert Link<> to typed
Change-Id: I39b8eac11eb59594c7fbca8c5fd3b1383167f577
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/srchdlg.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 3 | ||||
| -rw-r--r-- | sfx2/source/dialog/srchdlg.cxx | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index fd35c932addf..444a8b7473d1 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -43,7 +43,7 @@ private: VclPtr<CheckBox> m_pBackwardsBox; VclPtr<PushButton> m_pFindBtn; - Link<> m_aFindHdl; + Link<SearchDialog&,void> m_aFindHdl; Link<> m_aCloseHdl; OUString m_sConfigName; @@ -61,7 +61,7 @@ public: virtual ~SearchDialog(); virtual void dispose() SAL_OVERRIDE; - void SetFindHdl( const Link<>& rLink ) { m_aFindHdl = rLink; } + void SetFindHdl( const Link<SearchDialog&,void>& rLink ) { m_aFindHdl = rLink; } void SetCloseHdl( const Link<>& rLink ) { m_aCloseHdl = rLink; } OUString GetSearchText() const { return m_pSearchEdit->GetText(); } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 9e60bd75ad51..8ef07fa1de79 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2256,7 +2256,11 @@ IMPL_LINK_NOARG_TYPED( SfxHelpTextWindow_Impl, NotifyHdl, LinkParamNone*, void ) -IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg ) +IMPL_LINK_TYPED( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog&, rDlg, void ) +{ + FindHdl(&rDlg); +} +void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) { bool bWrapAround = ( NULL == pDlg ); if ( bWrapAround ) @@ -2334,8 +2338,6 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg ) { OSL_FAIL( "SfxHelpTextWindow_Impl::SelectHdl(): unexpected exception" ); } - - return 0; } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 89c7d5575a79..2738a915c968 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -453,9 +453,10 @@ private: DECL_LINK_TYPED( SelectHdl, Idle *, void); DECL_LINK_TYPED( NotifyHdl, LinkParamNone*, void ); - DECL_LINK( FindHdl, sfx2::SearchDialog* ); + DECL_LINK_TYPED( FindHdl, sfx2::SearchDialog&, void ); DECL_LINK( CloseHdl, sfx2::SearchDialog* ); DECL_LINK_TYPED( CheckHdl, Button*, void ); + void FindHdl(sfx2::SearchDialog*); public: SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 9f4d099c4bec..8a57056e4c7d 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -140,7 +140,7 @@ IMPL_LINK_NOARG_TYPED(SearchDialog, FindHdl, Button*, void) m_pSearchEdit->RemoveEntryAt(nPos); if ( nPos > 0 ) m_pSearchEdit->InsertEntry( sSrchTxt, 0 ); - m_aFindHdl.Call( this ); + m_aFindHdl.Call( *this ); } void SearchDialog::SetFocusOnEdit() |