diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-10 14:39:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-11 08:48:54 +0200 |
| commit | cf0c04a428754dfd5aa477cebc5441bc74e27005 (patch) | |
| tree | 6d4657ec370a3378887745b34d217a91bdab2eef /cui/source/tabpages/macroass.cxx | |
| parent | e8ee8473361f09034fdcd4f30a2325a53a512a7a (diff) | |
convert Link<> to typed
Change-Id: I85658fa35b9b85106a3b9c8ef303584cad6f39b0
Diffstat (limited to 'cui/source/tabpages/macroass.cxx')
| -rw-r--r-- | cui/source/tabpages/macroass.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 153ce47b39e4..2401676279d5 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -296,10 +296,15 @@ IMPL_LINK_NOARG_TYPED( _SfxMacroTabPage, SelectMacro_Impl, SvTreeListBox*, void) IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteClickHdl_Impl, Button*, pBtn, void ) { - AssignDeleteHdl_Impl(static_cast<PushButton*>(pBtn)); + AssignDeleteHdl(pBtn); } -IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) +IMPL_LINK_TYPED( _SfxMacroTabPage, AssignDeleteHdl_Impl, SvTreeListBox*, pBtn, bool ) +{ + return AssignDeleteHdl(pBtn); +} + +bool _SfxMacroTabPage::AssignDeleteHdl(Control* pBtn) { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); SvTreeListEntry* pE = rListBox.FirstSelected(); @@ -308,7 +313,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) ( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) ) { DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" ); - return 0; + return false; } const bool bAssEnabled = pBtn != mpImpl->pDeletePB && mpImpl->pAssignPB->IsEnabled(); @@ -342,7 +347,7 @@ IMPL_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) rListBox.SetUpdateMode( true ); EnableButtons(); - return 0; + return false; } IMPL_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*,, void ) @@ -367,7 +372,7 @@ void _SfxMacroTabPage::InitAndSetHandler() { SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox(); HeaderBar& rHeaderBar = mpImpl->pEventLB->GetHeaderBar(); - Link<> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); + Link<SvTreeListBox*,bool> aLnk(LINK(this, _SfxMacroTabPage, AssignDeleteHdl_Impl )); mpImpl->pMacroLB->SetDoubleClickHdl( aLnk ); mpImpl->pDeletePB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) ); mpImpl->pAssignPB->SetClickHdl( LINK(this, _SfxMacroTabPage, AssignDeleteClickHdl_Impl ) ); |