diff options
Diffstat (limited to 'sw/source/filter/html/css1atr.cxx')
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index e98134fdc5ce..0d4813c8e15b 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -187,15 +187,22 @@ OString lclConvToHex(sal_uInt16 nHex) } } -/// Determines if rProperty has to be suppressed due to ReqIF mode. -bool IgnorePropertyForReqIF(bool bReqIF, const OString& rProperty) +bool IgnorePropertyForReqIF(bool bReqIF, const OString& rProperty, const OString& rValue) { if (!bReqIF) return false; // Only allow these two keys, nothing else in ReqIF mode. if (rProperty == sCSS1_P_text_decoration) - return false; + { + // Deny other text-decoration values (e.g. "none"). + if (rValue == "underline" || rValue == "line-through") + { + return false; + } + + return true; + } if (rProperty == sCSS1_P_color) return false; @@ -236,7 +243,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal, const OUString *pSVal ) { - if (IgnorePropertyForReqIF(mbReqIF, pProp)) + if (IgnorePropertyForReqIF(mbReqIF, pProp, pVal)) return; OStringBuffer sOut; |