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

[Harri Pitkänen]

 sw/source/filter/html/css1atr.cxx |    4 ----
 sw/source/filter/html/htmlatr.cxx |    3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 2b531388388853342d6ecefcbeb2027f22f8728c
Author: Harri Pitkänen <hatapitk at iki.fi>
Date:   Sat Apr 12 13:46:54 2014 +0300

    Enable letter-spacing for Firefox HTML export
    
    Kerning (letter-spacing in CSS) was disabled for Firefox HTML
    export mode. There is no need to do that since Firefox does
    support this feature.
    
    Change-Id: I237063d52f50d79517bf83d5d1904f2164095d31
    Reviewed-on: https://gerrit.libreoffice.org/8947
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index fa65155..1e51c69 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2577,10 +2577,6 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt )
 {
     SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
 
-    // Only export Kerning-Item, if the Style supports it fully
-    if( !rHTMLWrt.IsHTMLMode(HTMLMODE_FULL_STYLES) )
-        return rWrt;
-
     sal_Int16 nValue = ((const SvxKerningItem&)rHt).GetValue();
     if( nValue )
     {
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 216a925..e8c4156 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1349,8 +1349,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
         break;
 
     case RES_CHRATR_KERNING:
-        if( IsHTMLMode(HTMLMODE_FULL_STYLES) )
-            eState = HTML_STYLE_VALUE;
+        eState = HTML_STYLE_VALUE;
         break;
 
     case RES_CHRATR_BACKGROUND: