diff options
| author | Noel Grandin <noel@peralex.com> | 2016-04-05 09:40:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-04-05 09:41:31 +0200 |
| commit | c10d56c6c33ad27d9f4fb12e499a8b246d88da9f (patch) | |
| tree | 408ff2b3371bd0cf3cfea1dcab465aad6b4fad4b | |
| parent | b8c528a3515616bf0ec852c2f7b1bb07dc9f7ed2 (diff) | |
tdf#98647 fix bug in tools->outline-numbering
fallout from
commit e85b2333bce7b1dcae73861df6d90b48b9f4efe5
"convert Link<> to typed"
Change-Id: I8f98bcf6d1eff596e139f9f3a2e3d32fcce67d11
| -rw-r--r-- | sw/source/ui/misc/num.cxx | 15 | ||||
| -rw-r--r-- | sw/source/uibase/inc/num.hxx | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index cee23c321728..ff67892ed4f3 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -131,16 +131,19 @@ SwNumPositionTabPage::SwNumPositionTabPage(vcl::Window* pParent, m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SwNumPositionTabPage, LabelFollowedByHdl_Impl) ); aLk = LINK(this, SwNumPositionTabPage, ListtabPosHdl_Impl); + aLk2 = LINK(this, SwNumPositionTabPage, ListtabPosFocusHdl_Impl); m_pListtabMF->SetUpHdl(aLk); m_pListtabMF->SetDownHdl(aLk); m_pListtabMF->SetLoseFocusHdl(aLk2); aLk = LINK(this, SwNumPositionTabPage, AlignAtHdl_Impl); + aLk2 = LINK(this, SwNumPositionTabPage, AlignAtFocusHdl_Impl); m_pAlignedAtMF->SetUpHdl(aLk); m_pAlignedAtMF->SetDownHdl(aLk); m_pAlignedAtMF->SetLoseFocusHdl(aLk2); aLk = LINK(this, SwNumPositionTabPage, IndentAtHdl_Impl); + aLk2 = LINK(this, SwNumPositionTabPage, IndentAtFocusHdl_Impl); m_pIndentAtMF->SetUpHdl(aLk); m_pIndentAtMF->SetDownHdl(aLk); m_pIndentAtMF->SetLoseFocusHdl(aLk2); @@ -818,6 +821,10 @@ IMPL_LINK_NOARG_TYPED(SwNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, v SetModified(); } +IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) +{ + ListtabPosHdl_Impl(static_cast<SpinField&>(rControl)); +} IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); @@ -840,6 +847,10 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rSpin, vo SetModified(); } +IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) +{ + AlignAtHdl_Impl(static_cast<SpinField&>(rControl)); +} IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); @@ -863,6 +874,10 @@ IMPL_LINK_TYPED( SwNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rSpin, void SetModified(); } +IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) +{ + IndentAtHdl_Impl(static_cast<SpinField&>(rControl)); +} IMPL_LINK_TYPED( SwNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rSpin, void ) { MetricField& rField = static_cast<MetricField&>(rSpin); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 9ec51ae1b88c..c0b0ac00ff33 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -96,8 +96,11 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; |