diff options
| author | Joren De Cuyper <jorendc@libreoffice.org> | 2014-07-31 12:28:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-12 03:20:06 -0500 |
| commit | ff12ec8ea00530768d5e07dcc9ab200ce7f54ef6 (patch) | |
| tree | 8bd2b7c72c4e0b23a97accd05505e8c09d256bef | |
| parent | 8994fac52888fb563751cb79aea88e2fde26263d (diff) | |
fdo#41350 "Expand Single Word" only shown active for "Last line: Justified"
Change-Id: Ibe90d041f15fd007026676ea626c672a9805b263
Reviewed-on: https://gerrit.libreoffice.org/10656
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 21dc407b378f..db62e93c85d8 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1171,9 +1171,7 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) bool bEnable = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bEnable); m_pLastLineLB->Enable(bEnable); - m_pExpandCB->Enable(bEnable); - m_pExpandCB->Check(SVX_ADJUST_BLOCK == rAdj.GetOneWord()); switch(rAdj.GetLastBlock()) { case SVX_ADJUST_LEFT: nLBSelect = 0; break; @@ -1183,6 +1181,8 @@ void SvxParaAlignTabPage::Reset( const SfxItemSet* rSet ) case SVX_ADJUST_BLOCK: nLBSelect = 2; break; default: ; //prevent warning } + m_pExpandCB->Enable(bEnable && nLBSelect == 2); + m_pExpandCB->Check(SVX_ADJUST_BLOCK == rAdj.GetOneWord()); } else { @@ -1249,13 +1249,17 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl) bool bJustify = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bJustify); m_pLastLineLB->Enable(bJustify); - m_pExpandCB->Enable(bJustify); + bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; + m_pExpandCB->Enable(bJustify && bLastLineIsBlock); UpdateExample_Impl(false); return 0; } 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); return 0; } |