diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 09:59:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 12:05:38 +0200 |
| commit | c9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch) | |
| tree | 2cb864a67b556f807ba175507296f7dfc5254944 /formula | |
| parent | 8c4a1663f5d93380268365d35a5581d8065df897 (diff) | |
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 5 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcutl.cxx | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 1d731535bf1e..a857c60388f2 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -356,7 +356,7 @@ FormulaDlg_Impl::~FormulaDlg_Impl() { if(aIdle.IsActive()) { - aIdle.SetIdleHdl(Link<>()); + aIdle.SetIdleHdl(Link<Idle *, void>()); aIdle.Stop(); }// if(aIdle.IsActive()) bIsShutDown=true;// Set it in order to PreNotify not to save GetFocus. @@ -1863,7 +1863,7 @@ void FormulaDlg::SetEdSelection() { m_pImpl->SetEdSelection(); } -IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl) +IMPL_LINK_NOARG_TYPED(FormulaDlg, UpdateFocusHdl, Idle *, void) { FormEditData* pData = m_pImpl->m_pHelper->getFormEditData(); @@ -1873,7 +1873,6 @@ IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl) OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } - return 0; } diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 4fe03a17f037..a9d6f6a05862 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -503,7 +503,7 @@ RefEdit::~RefEdit() void RefEdit::dispose() { - aIdle.SetIdleHdl( Link<>() ); + aIdle.SetIdleHdl( Link<Idle *, void>() ); aIdle.Stop(); pLabelWidget.clear(); Edit::dispose(); @@ -551,7 +551,7 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel } else { - aIdle.SetIdleHdl( Link<>() ); + aIdle.SetIdleHdl( Link<Idle *, void>() ); aIdle.Stop(); } } @@ -585,11 +585,10 @@ void RefEdit::LoseFocus() pAnyRefDlg->HideReference(); } -IMPL_LINK_NOARG(RefEdit, UpdateHdl) +IMPL_LINK_NOARG_TYPED(RefEdit, UpdateHdl, Idle *, void) { if( pAnyRefDlg ) pAnyRefDlg->ShowReference( GetText() ); - return 0; } //class RefButton |