Kaydet (Commit) 98785dbb authored tarafından Noel Grandin's avatar Noel Grandin

fix tdf#95689 - List indent is broken

caused by my commit e85b2333
"convert Link<> to typed"

Change-Id: Ieeb9e6fa5d5be3789ea70549e85d4bd3ffd51e59
üst 147b74be
...@@ -440,8 +440,11 @@ class SvxNumPositionTabPage : public SfxTabPage ...@@ -440,8 +440,11 @@ class SvxNumPositionTabPage : public SfxTabPage
DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void);
DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, 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( AlignAtHdl_Impl, SpinField&, void );
DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void );
DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void );
DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void );
public: public:
SvxNumPositionTabPage(vcl::Window* pParent, SvxNumPositionTabPage(vcl::Window* pParent,
......
...@@ -2803,16 +2803,19 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, ...@@ -2803,16 +2803,19 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent,
m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) ); m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) );
aLk3 = LINK(this, SvxNumPositionTabPage, ListtabPosHdl_Impl); aLk3 = LINK(this, SvxNumPositionTabPage, ListtabPosHdl_Impl);
aLk2 = LINK(this, SvxNumPositionTabPage, ListtabPosFocusHdl_Impl);
m_pListtabMF->SetUpHdl(aLk3); m_pListtabMF->SetUpHdl(aLk3);
m_pListtabMF->SetDownHdl(aLk3); m_pListtabMF->SetDownHdl(aLk3);
m_pListtabMF->SetLoseFocusHdl(aLk2); m_pListtabMF->SetLoseFocusHdl(aLk2);
aLk3 = LINK(this, SvxNumPositionTabPage, AlignAtHdl_Impl); aLk3 = LINK(this, SvxNumPositionTabPage, AlignAtHdl_Impl);
aLk2 = LINK(this, SvxNumPositionTabPage, AlignAtFocusHdl_Impl);
m_pAlignedAtMF->SetUpHdl(aLk3); m_pAlignedAtMF->SetUpHdl(aLk3);
m_pAlignedAtMF->SetDownHdl(aLk3); m_pAlignedAtMF->SetDownHdl(aLk3);
m_pAlignedAtMF->SetLoseFocusHdl(aLk2); m_pAlignedAtMF->SetLoseFocusHdl(aLk2);
aLk3 = LINK(this, SvxNumPositionTabPage, IndentAtHdl_Impl); aLk3 = LINK(this, SvxNumPositionTabPage, IndentAtHdl_Impl);
aLk2 = LINK(this, SvxNumPositionTabPage, IndentAtFocusHdl_Impl);
m_pIndentAtMF->SetUpHdl(aLk3); m_pIndentAtMF->SetUpHdl(aLk3);
m_pIndentAtMF->SetDownHdl(aLk3); m_pIndentAtMF->SetDownHdl(aLk3);
m_pIndentAtMF->SetLoseFocusHdl(aLk2); m_pIndentAtMF->SetLoseFocusHdl(aLk2);
...@@ -3542,6 +3545,10 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, ...@@ -3542,6 +3545,10 @@ IMPL_LINK_NOARG_TYPED(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&,
SetModified(); 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 ) IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, void )
{ {
// determine value to be set at the chosen list levels // determine value to be set at the chosen list levels
...@@ -3563,6 +3570,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, vo ...@@ -3563,6 +3570,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, ListtabPosHdl_Impl, SpinField&, rFld, vo
SetModified(); 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 ) IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void )
{ {
// determine value to be set at the chosen list levels // determine value to be set at the chosen list levels
...@@ -3585,6 +3596,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void ...@@ -3585,6 +3596,10 @@ IMPL_LINK_TYPED( SvxNumPositionTabPage, AlignAtHdl_Impl, SpinField&, rFld, void
SetModified(); 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 ) IMPL_LINK_TYPED( SvxNumPositionTabPage, IndentAtHdl_Impl, SpinField&, rFld, void )
{ {
// determine value to be set at the chosen list levels // determine value to be set at the chosen list levels
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment