diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 07:23:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 08:10:11 +0000 |
| commit | be73c1602dbe4d0f09d0e9c4853ec89df3eb37ad (patch) | |
| tree | 90fea0177273fd5a9499fa66e84f3316de3fe6d7 /vcl/source/control | |
| parent | 61afb4bebafe6e615611e74b17ce0fc43648813f (diff) | |
convert Link<> to typed
Change-Id: I3127752785b77672d37f99bc9eaa881377dabe7c
Reviewed-on: https://gerrit.libreoffice.org/18431
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/control/lstbox.cxx | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 9473edc1ccb8..4de4ec97ffda 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -82,7 +82,7 @@ struct ComboBox::Impl DECL_DLLPRIVATE_LINK( ImplSelectHdl, void* ); DECL_DLLPRIVATE_LINK( ImplCancelHdl, void* ); DECL_DLLPRIVATE_LINK( ImplDoubleClickHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplPopupModeEndHdl, FloatingWindow*, void ); DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* ); DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* ); @@ -327,7 +327,7 @@ void ComboBox::Impl::ImplClickButtonHandler( ImplBtn* ) m_pImplLB->GetMainWindow()->ImplClearLayoutData(); } -IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl) +IMPL_LINK_NOARG_TYPED(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void) { if (m_pFloatWin->IsPopupModeCanceled()) { @@ -348,7 +348,6 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl) m_pBtn->SetPressed( false ); m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); - return 0; } void ComboBox::Impl::ImplAutocompleteHandler( Edit* pEdit ) diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index b89f7f3a524d..a108a537b578 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -318,7 +318,7 @@ void ListBox::ImplClickButtonHandler( Control* ) } } -IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) +IMPL_LINK_NOARG_TYPED(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void) { if( mpFloatWin->IsPopupModeCanceled() ) { @@ -333,7 +333,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) ImplAddDel( &aCheckDelete ); Select(); if ( aCheckDelete.IsDead() ) - return 0; + return; ImplRemoveDel( &aCheckDelete ); mpImplLB->SetTravelSelect( bTravelSelect ); @@ -348,7 +348,6 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl) mpBtn->SetPressed( false ); CallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); - return 0; } void ListBox::ToggleDropDown() |