diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2016-02-24 21:28:59 +0400 |
|---|---|---|
| committer | Yousuf Philips <philipz85@hotmail.com> | 2016-03-21 15:33:42 +0000 |
| commit | 93e607517342cc3fa672957535570d1790058807 (patch) | |
| tree | 79b3bad68f55d002011aa636a01b36b8451af580 | |
| parent | 319ab1d20df6fa32f129bd28746a4567d14a6bef (diff) | |
tdf#97251 Always show the text direction alignment control
Change-Id: I349ac47e08f9a9d55dd955026988273e126ad4c7
Reviewed-on: https://gerrit.libreoffice.org/22673
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
| -rw-r--r-- | cui/source/tabpages/align.cxx | 16 | ||||
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 11 | ||||
| -rw-r--r-- | cui/uiconfig/ui/paragalignpage.ui | 1 |
3 files changed, 7 insertions, 21 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index aac518d4084a..ed2e0dc68390 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -208,19 +208,9 @@ AlignmentTabPage::AlignmentTabPage( vcl::Window* pParent, const SfxItemSet& rCor // Asian vertical mode m_pCbAsianMode->Show( SvtCJKOptions().IsVerticalTextEnabled() ); - - if( !SvtLanguageOptions().IsCTLFontEnabled() ) - { - m_pBoxDirection->Hide(); - } - else - { - // CTL frame direction - m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP ); - m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP ); - m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT ); - m_pBoxDirection->Show(); - } + m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP ); + m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP ); + m_pLbFrameDir->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT ); // This page needs ExchangeSupport. SetExchangeSupport(); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 775e80b61dd8..49bbfeb5c99c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1035,14 +1035,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet m_pLastLineLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) ); m_pTextDirectionLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) ); - if( aLangOptions.IsCTLFontEnabled() ) - { - m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP ); - m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP ); - m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT ); - - m_pPropertiesFL->Show(); - } + m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_LTR ), FRMDIR_HORI_LEFT_TOP ); + m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_RTL ), FRMDIR_HORI_RIGHT_TOP ); + m_pTextDirectionLB->InsertEntryValue( CUI_RESSTR( RID_SVXSTR_FRAMEDIR_SUPER ), FRMDIR_ENVIRONMENT ); setPreviewsToSamePlace(pParent, this); } diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui index 920832d7e61b..5ac0b4932213 100644 --- a/cui/uiconfig/ui/paragalignpage.ui +++ b/cui/uiconfig/ui/paragalignpage.ui @@ -407,6 +407,7 @@ </child> <child> <object class="GtkFrame" id="framePROPERTIES"> + <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> |