[Libreoffice-commits] core.git: cui/source

[Harri Pitkänen]

 cui/source/tabpages/paragrph.cxx |   24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

New commits:
commit 0466ab0c66c514dd53676483cab2fb2c60e60667
Author: Harri Pitkänen <hatapitk at iki.fi>
Date:   Sat Oct 25 11:20:08 2014 +0300

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ad93257..f5b2148 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);