diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-19 17:23:56 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-03-19 21:51:43 +0100 |
| commit | afe4dfe1d60b81ff673f0859c8c79c19ef26356c (patch) | |
| tree | c7fe6405636d28544aad99c8c04c7e9533d464f8 /sw/source/filter/html | |
| parent | 8f0f5353b079073b450c099bea659bcd4848f830 (diff) | |
sw XHTML export: avoid <strike> for strikeout in ReqIF mode
Similar to how <u> for underline is avoided, the spec explicitly forbids
this.
Change-Id: I314a49df496d7b02049154564884e296b9633576
Reviewed-on: https://gerrit.libreoffice.org/51578
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/css1atr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 7ab0cf7b3f59..9a8acd083eac 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -2289,7 +2289,7 @@ static Writer& OutCSS1_SvxTextLn_SvxCrOut_SvxBlink( Writer& rWrt, { // this also works in HTML does not need to be written as // a STYLE-Options, and must not be written as Hint - OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT), + OSL_ENSURE( !rHTMLWrt.IsCSS1Source(CSS1_OUTMODE_HINT) || rHTMLWrt.mbReqIF, "write crossedOut as Hint?" ); pCOStr = sCSS1_PV_line_through; } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index b148cf181237..76306190a831 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -2758,7 +2758,7 @@ static Writer& OutHTML_SwCrossedOut( Writer& rWrt, const SfxPoolItem& rHt ) // Because of Netscape, we output STRIKE and not S! const FontStrikeout nStrike = static_cast<const SvxCrossedOutItem&>(rHt).GetStrikeout(); - if( STRIKEOUT_NONE != nStrike ) + if( STRIKEOUT_NONE != nStrike && !rHTMLWrt.mbReqIF ) { HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_strike, rHTMLWrt.m_bTagOn ); } |