Kaydet (Commit) ff12ec8e authored tarafından Joren De Cuyper's avatar Joren De Cuyper Kaydeden (comit) Caolán McNamara

fdo#41350 "Expand Single Word" only shown active for "Last line: Justified"

Change-Id: Ibe90d041f15fd007026676ea626c672a9805b263
Reviewed-on: https://gerrit.libreoffice.org/10656Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8994fac5
...@@ -1171,9 +1171,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) ...@@ -1171,9 +1171,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
bool bEnable = m_pJustify->IsChecked(); bool bEnable = m_pJustify->IsChecked();
m_pLastLineFT->Enable(bEnable); m_pLastLineFT->Enable(bEnable);
m_pLastLineLB->Enable(bEnable); m_pLastLineLB->Enable(bEnable);
m_pExpandCB->Enable(bEnable);
m_pExpandCB->Check(SVX_ADJUST_BLOCK == rAdj.GetOneWord());
switch(rAdj.GetLastBlock()) switch(rAdj.GetLastBlock())
{ {
case SVX_ADJUST_LEFT: nLBSelect = 0; break; case SVX_ADJUST_LEFT: nLBSelect = 0; break;
...@@ -1183,6 +1181,8 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) ...@@ -1183,6 +1181,8 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet )
case SVX_ADJUST_BLOCK: nLBSelect = 2; break; case SVX_ADJUST_BLOCK: nLBSelect = 2; break;
default: ; //prevent warning default: ; //prevent warning
} }
m_pExpandCB->Enable(bEnable && nLBSelect == 2);
m_pExpandCB->Check(SVX_ADJUST_BLOCK == rAdj.GetOneWord());
} }
else else
{ {
...@@ -1249,13 +1249,17 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) ...@@ -1249,13 +1249,17 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl)
bool bJustify = m_pJustify->IsChecked(); bool bJustify = m_pJustify->IsChecked();
m_pLastLineFT->Enable(bJustify); m_pLastLineFT->Enable(bJustify);
m_pLastLineLB->Enable(bJustify); m_pLastLineLB->Enable(bJustify);
m_pExpandCB->Enable(bJustify); bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2;
m_pExpandCB->Enable(bJustify && bLastLineIsBlock);
UpdateExample_Impl(false); UpdateExample_Impl(false);
return 0; return 0;
} }
IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl) IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl)
{ {
//fdo#41350 only enable 'Expand last word' if last line is also justified
bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2;
m_pExpandCB->Enable(bLastLineIsBlock);
UpdateExample_Impl(false); UpdateExample_Impl(false);
return 0; return 0;
} }
......
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