diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-12 12:19:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 12:29:26 +0200 |
| commit | 98785dbb95eca5443b38535cba6552e21d4e2c5b (patch) | |
| tree | e8176cbc2d4f3aa5de22c49e063c028e2f61a192 /cui | |
| parent | 147b74beea7b5f0fb121e5495bbdfb4869786603 (diff) | |
fix tdf#95689 - List indent is broken
caused by my commit e85b2333bce7b1dcae73861df6d90b48b9f4efe5
"convert Link<> to typed"
Change-Id: Ieeb9e6fa5d5be3789ea70549e85d4bd3ffd51e59
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/numpages.hxx | 3 | ||||
| -rw-r--r-- | cui/source/tabpages/numpages.cxx | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 8e7194cf5299..cea7ac040f5c 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -440,8 +440,11 @@ class SvxNumPositionTabPage : 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 ); public: SvxNumPositionTabPage(vcl::Window* pParent, diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index e032500967e3..c9b5b2a9f56e 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2803,16 +2803,19 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) ); aLk3 = LINK(this, SvxNumPositionTabPage, ListtabPosHdl_Impl); + aLk2 = LINK(this, SvxNumPositionTabPage, ListtabPosFocusHdl_Impl); m_pListtabMF->SetUpHdl(aLk3); m_pListtabMF->SetDownHdl(aLk3); m_pListtabMF->SetLoseFocusHdl(aLk2); aLk3 = LINK(this, SvxNumPositionTabPage, AlignAtHdl_Impl); + aLk2 = LINK(this, SvxNumPositionTabPage, AlignAtFocusHdl_Impl); m_pAlignedAtMF->SetUpHdl(aLk3); m_pAlignedAtMF->SetDownHdl(aLk3); m_pAlignedAtMF->SetLoseFocusHdl(aLk2); aLk3 = LINK(this, SvxNumPositionTabPage, IndentAtHdl_Impl); + aLk2 = LINK(this, SvxNumPositionTabPage, IndentAtFocusHdl_Impl); m_pIndentAtMF->SetUpHdl(aLk3); m_pIndentAtMF->SetDownHdl(aLk3); m_pIndentAtMF->SetLoseFocusHdl(aLk2); @@ -3542,6 +3545,10 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, SetModified(); } +IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosFocusHdl_Impl, Control&, rControl, void ) +{ + ListtabPosHdl_Impl(static_cast<SpinField&>(rControl)); +} IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels @@ -3563,6 +3570,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, vo SetModified(); } +IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtFocusHdl_Impl, Control&, rControl, void ) +{ + AlignAtHdl_Impl(static_cast<SpinField&>(rControl)); +} IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels @@ -3585,6 +3596,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void SetModified(); } +IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtFocusHdl_Impl, Control&, rControl, void ) +{ + IndentAtHdl_Impl(static_cast<SpinField&>(rControl)); +} IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void ) { // determine value to be set at the chosen list levels |