diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-24 18:59:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-25 18:19:12 +0000 |
| commit | 51b2ad378a8531a7b02433594cd7f6bbd6a61222 (patch) | |
| tree | b4d32c26ac00aeb87d5d82d4f33431d43f91ed0e /cui | |
| parent | 825b9982a5de3ab94820ce5257bb446ea0a1c20a (diff) | |
convert Link<> to typed
Change-Id: I9a85b8d6557490775c3d8482ac49bd27c51b6c8a
Reviewed-on: https://gerrit.libreoffice.org/18853
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 4 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 4 | ||||
| -rw-r--r-- | cui/source/options/optcolor.cxx | 6 | ||||
| -rw-r--r-- | cui/source/options/optcolor.hxx | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 88806b38b530..94356f2d8115 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -587,7 +587,7 @@ void AbstractSvxNameDialog_Impl::GetName(OUString& rName) pDlg->GetName( rName ); } -void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately ) +void AbstractSvxNameDialog_Impl::SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately ) { aCheckNameHdl = rLink; if( rLink.IsSet() ) @@ -610,7 +610,7 @@ void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr ) IMPL_LINK_NOARG_TYPED(AbstractSvxNameDialog_Impl, CheckNameHdl, SvxNameDialog&, bool) { if( aCheckNameHdl.IsSet() ) - return aCheckNameHdl.Call(this); + return aCheckNameHdl.Call(*this); return false; } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 5477392c99e7..949e25266f4c 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -325,13 +325,13 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog { DECL_ABSTDLG_BASE(AbstractSvxNameDialog_Impl,SvxNameDialog) virtual void GetName( OUString& rName ) SAL_OVERRIDE ; - virtual void SetCheckNameHdl( const Link<>& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ; + virtual void SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) SAL_OVERRIDE ; virtual void SetEditHelpId(const OString&) SAL_OVERRIDE ; //from class Window virtual void SetHelpId( const OString& ) SAL_OVERRIDE ; virtual void SetText( const OUString& rStr ) SAL_OVERRIDE ; private: - Link<> aCheckNameHdl; + Link<AbstractSvxNameDialog&,bool> aCheckNameHdl; DECL_LINK_TYPED(CheckNameHdl, SvxNameDialog&, bool); }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 76a2ec3172f4..d95fd2a6a0d5 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1227,11 +1227,11 @@ IMPL_LINK_TYPED(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, vo m_pDeleteSchemePB->Enable( m_pColorSchemeLB->GetEntryCount() > 1 ); } -IMPL_LINK(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog*, pDialog ) +IMPL_LINK_TYPED(SvxColorOptionsTabPage, CheckNameHdl_Impl, AbstractSvxNameDialog&, rDialog, bool ) { OUString sName; - pDialog->GetName(sName); - return long(!sName.isEmpty() && LISTBOX_ENTRY_NOTFOUND == m_pColorSchemeLB->GetEntryPos( sName )); + rDialog.GetName(sName); + return !sName.isEmpty() && LISTBOX_ENTRY_NOTFOUND == m_pColorSchemeLB->GetEntryPos( sName ); } void SvxColorOptionsTabPage::FillUserData() diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index ca290410d458..f182e4bd5d3d 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -43,7 +43,7 @@ class SvxColorOptionsTabPage : public SfxTabPage DECL_LINK(SchemeChangedHdl_Impl, ListBox*); DECL_LINK_TYPED(SaveDeleteHdl_Impl, Button*, void); - DECL_LINK(CheckNameHdl_Impl, AbstractSvxNameDialog*); + DECL_LINK_TYPED(CheckNameHdl_Impl, AbstractSvxNameDialog&, bool); void UpdateColorConfig(); public: |