diff options
| -rw-r--r-- | sfx2/inc/srchdlg.hxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/srchdlg.cxx | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 0210ed23436b..b6e8d2ae7588 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -43,7 +43,7 @@ private: VclPtr<PushButton> m_pFindBtn; Link<SearchDialog&,void> m_aFindHdl; - Link<SearchDialog*,void> m_aCloseHdl; + Link<LinkParamNone*,void> m_aCloseHdl; OUString m_sConfigName; OString m_sWinState; @@ -61,7 +61,7 @@ public: virtual void dispose() override; void SetFindHdl( const Link<SearchDialog&,void>& rLink ) { m_aFindHdl = rLink; } - void SetCloseHdl( const Link<SearchDialog*,void>& rLink ) { m_aCloseHdl = rLink; } + void SetCloseHdl( const Link<LinkParamNone*,void>& rLink ) { m_aCloseHdl = rLink; } OUString GetSearchText() const { return m_pSearchEdit->GetText(); } void SetSearchText( const OUString& _rText ) { m_pSearchEdit->SetText( _rText ); } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 7af2a0c7f604..4a67b06ef6ff 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2288,7 +2288,7 @@ void SfxHelpTextWindow_Impl::FindHdl(sfx2::SearchDialog* pDlg) } -IMPL_LINK_NOARG( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, void ) +IMPL_LINK_NOARG( SfxHelpTextWindow_Impl, CloseHdl, LinkParamNone*, void ) { pSrchDlg.clear(); } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 499d8072e7fc..74de410b71e3 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -457,7 +457,7 @@ private: DECL_LINK( SelectHdl, Timer *, void); DECL_LINK( NotifyHdl, LinkParamNone*, void ); DECL_LINK( FindHdl, sfx2::SearchDialog&, void ); - DECL_LINK( CloseHdl, sfx2::SearchDialog*, void ); + DECL_LINK( CloseHdl, LinkParamNone*, void ); DECL_LINK( CheckHdl, Button*, void ); void FindHdl(sfx2::SearchDialog*); diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index fcc11b39f9bd..757df710d019 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -67,7 +67,6 @@ SearchDialog::~SearchDialog() void SearchDialog::dispose() { SaveConfig(); - m_aCloseHdl.Call( nullptr ); m_pSearchEdit.clear(); m_pWholeWordsBox.clear(); m_pMatchCaseBox.clear(); @@ -151,7 +150,7 @@ void SearchDialog::SetFocusOnEdit() bool SearchDialog::Close() { bool bRet = ModelessDialog::Close(); - m_aCloseHdl.Call( this ); + m_aCloseHdl.Call( nullptr ); return bRet; } |