Attachment 70308 Details for Bug 57320 – write display:none for hidden text in HTML export

[patch] write display:none for hidden text in HTML export

libo_html_hidden.diff (text/plain), 3.13 KB, created by libreoffice on 2012-11-20 12:14:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: libreoffice

Created: 2012-11-20 12:14:11 UTC

Size: 3.13 KB

patch

obsolete

>diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
>index c8c504c..4db4a13 100644
>--- a/sw/source/filter/html/css1atr.cxx
>+++ b/sw/source/filter/html/css1atr.cxx
>@@ -52,6 +52,7 @@
> #include <editeng/widwitem.hxx>
> #include <editeng/spltitem.hxx>
> #include <editeng/orphitem.hxx>
>+#include <editeng/charhiddenitem.hxx>
> #include <svx/xoutbmp.hxx>
> #include <svx/svdobj.hxx>
> #include <editeng/langitem.hxx>
>@@ -2827,6 +2828,15 @@ static Writer& OutCSS1_SvxOverline( Writer& rWrt, const SfxPoolItem& rHt )
>     return rWrt;
> }
> 
>+static Writer& OutCSS1_SvxHidden( Writer& rWrt, const SfxPoolItem& rHt )
>+{
>+    SwHTMLWriter& rHTMLWrt = (SwHTMLWriter&)rWrt;
>+
>+    if ( ((const SvxCharHiddenItem&)rHt).GetValue() )
>+        rHTMLWrt.OutCSS1_PropertyAscii( sCSS1_P_display, sCSS1_PV_none );
>+
>+    return rWrt;
>+}
> 
> static Writer& OutCSS1_SvxFontWeight( Writer& rWrt, const SfxPoolItem& rHt )
> {
>@@ -3756,7 +3766,7 @@ SwAttrFnTab aCSS1AttrFnTab = {
> /* RES_CHRATR_TWO_LINES */          0,
> /* RES_CHRATR_SCALEW */             0,
> /* RES_CHRATR_RELIEF */             0,
>-/* RES_CHRATR_HIDDEN */             0,
>+/* RES_CHRATR_HIDDEN */             OutCSS1_SvxHidden,
> /* RES_CHRATR_OVERLINE */           OutCSS1_SvxOverline,
> /* RES_CHRATR_RSID */               0,
> /* RES_CHRATR_DUMMY1 */             0,
>diff --git a/sw/source/filter/html/css1kywd.cxx b/sw/source/filter/html/css1kywd.cxx
>index df9269f..c9f989b 100644
>--- a/sw/source/filter/html/css1kywd.cxx
>+++ b/sw/source/filter/html/css1kywd.cxx
>@@ -274,4 +274,6 @@ sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_ltr, "ltr" );
> sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_rtl, "rtl" );
> sal_Char CSS1_CONSTASCII_DEF( sCSS1_PV_inherit, "inherit" );
> 
>+sal_Char CSS1_CONSTASCII_DEF( sCSS1_P_display, "display" );
>+
> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
>diff --git a/sw/source/filter/html/css1kywd.hxx b/sw/source/filter/html/css1kywd.hxx
>index 9628289..9306c16 100644
>--- a/sw/source/filter/html/css1kywd.hxx
>+++ b/sw/source/filter/html/css1kywd.hxx
>@@ -284,6 +284,8 @@ extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_ltr, "ltr" );
> extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_rtl, "rtl" );
> extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_PV_inherit, "inherit" );
> 
>+extern sal_Char CSS1_CONSTASCII_DECL( sCSS1_P_display, "display" );
>+
> #endif
> 
> 
>diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
>index 4281610..06bcfa5 100644
>--- a/sw/source/filter/html/htmlatr.cxx
>+++ b/sw/source/filter/html/htmlatr.cxx
>@@ -1353,6 +1353,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem )
>         break;
> 
>     case RES_CHRATR_OVERLINE:
>+    case RES_CHRATR_HIDDEN:
>         if( IsHTMLMode(HTMLMODE_SOME_STYLES) )
>             eState = HTML_STYLE_VALUE;
>         break;
>@@ -3244,7 +3245,7 @@ SwAttrFnTab aHTMLAttrFnTab = {
> /* RES_CHRATR_TWO_LINES */          0,
> /* RES_CHRATR_SCALEW */             0,
> /* RES_CHRATR_RELIEF */             0,
>-/* RES_CHRATR_HIDDEN */             0,
>+/* RES_CHRATR_HIDDEN */             OutHTML_CSS1Attr,
> /* RES_CHRATR_OVERLINE */           OutHTML_CSS1Attr,
> /* RES_CHRATR_RSID */               0,
> /* RES_CHRATR_DUMMY1 */             0,

Actions: View

Attachments on bug 57320: 70308