diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2014-10-25 11:20:08 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-30 14:07:37 +0000 |
| commit | 0466ab0c66c514dd53676483cab2fb2c60e60667 (patch) | |
| tree | 12761834adb2e0c65cf764c9c354a8dbffae332e /cui | |
| parent | 08ac08592da55a97e32cf16a00e1e34d65149a53 (diff) | |
Remove checks for HTMLMODE_SOME_STYLES
HTMLMODE_SOME_STYLES is enabled for all supported HTML export
modes so there is never need to disable these elements in
the paragraph dialog.
Change-Id: I43df54a6ce900c8a9f957522eb85ca67b6cd756f
Reviewed-on: https://gerrit.libreoffice.org/12091
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index ad93257faa94..f5b2148f299d 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -576,16 +576,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) m_pRegisterFL->Hide(); m_pRegisterCB->Hide(); m_pAutoCB->Hide(); - - if(!(nHtmlMode & HTMLMODE_SOME_STYLES)) // IE or SW - { - m_pRightLabel->Disable(); - m_pRightIndent->Disable(); - m_pTopDist->Disable(); //HTML3.2 and NS 3.0 - m_pBottomDist->Disable(); - m_pFLineIndent->Disable(); - m_pFLineLabel->Disable(); - } } // this sets the min/max limits; do this _after_ setting the values, @@ -1019,17 +1009,13 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( vcl::Window* pParent, const SfxItemSet m_pLastLineLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, LastLineHdl_Impl ) ); m_pTextDirectionLB->SetSelectHdl( LINK( this, SvxParaAlignTabPage, TextDirectionHdl_Impl ) ); - sal_uInt16 nHtmlMode = GetHtmlMode_Impl(rSet); - if(!(nHtmlMode & HTMLMODE_ON) || (0 != (nHtmlMode & HTMLMODE_SOME_STYLES)) ) + if( aLangOptions.IsCTLFontEnabled() ) { - 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_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_pPropertiesFL->Show(); } setPreviewsToSamePlace(pParent, this); |