filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 36
+-
sw/qa/extras/htmlexport/xhtmlexport.cxx | 30
++
sw/qa/extras/odfexport/data/tdf167910.fodt | 142
++++++++++
3 files changed, 193 insertions(+), 15 deletions(-)
New commits:
commit 8c6129cfe0669171d502d6662b2b4e31d8ac5ca0
Author: Michael Stahl <michael.st...@collabora.com>
AuthorDate: Mon Aug 11 18:49:25 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Aug 13 09:25:17 2025 +0200
tdf#167910 filter: xhtml: try to handle combinations of underline and
overline
Change-Id: I2dc735157d5278fb8e95881ef967443a48fee10f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189416
Reviewed-by: Michael Stahl <michael.st...@collabora.com>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189441
diff --git
a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
index d08905f42ef0..44d4cb2a7b24 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl
@@ -204,29 +204,35 @@
<xsl:text>; </xsl:text>
</xsl:template>
- <!-- FIXME this won't work if *both* underline and overline are set -->
<xsl:template match="@style:text-overline-style">
- <xsl:text>text-decoration:</xsl:text>
- <xsl:choose>
- <xsl:when test=".='none'">
- <xsl:text>none ! important</xsl:text>
- </xsl:when>
- <xsl:otherwise>
- <xsl:text>overline</xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:text>; </xsl:text>
+ <xsl:if test="not(../@style:text-underline-style)">
+ <xsl:text>text-decoration:</xsl:text>
+ <xsl:choose>
+ <xsl:when test=".='none'">
+ <xsl:text>none ! important</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>overline</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>; </xsl:text>
+ </xsl:if>
</xsl:template>
<xsl:template match="@style:text-underline-style">
<xsl:text>text-decoration:</xsl:text>
<xsl:choose>
- <!-- changing the distance measure: inch to in -->
- <xsl:when test=".='none'">
- <xsl:text>none ! important</xsl:text>
+ <xsl:when test=". != 'none' or
+ (../@style:text-overline-style and
../@style:text-overline-style != 'none')">
+ <xsl:if test=". != 'none'">
+ <xsl:text>underline</xsl:text>
+ </xsl:if>
+ <xsl:if test="(../@style:text-overline-style and
../@style:text-overline-style != 'none')">
+ <xsl:text> overline</xsl:text>
+ </xsl:if>
</xsl:when>
<xsl:otherwise>
- <xsl:text>underline</xsl:text>
+ <xsl:text>none ! important</xsl:text>
</xsl:otherwise>
</xsl:choose>
<xsl:text>; </xsl:text>
diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx
b/sw/qa/extras/htmlexport/xhtmlexport.cxx
index 358e72afee94..58068a6d953f 100644
--- a/sw/qa/extras/htmlexport/xhtmlexport.cxx
+++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx
@@ -71,6 +71,36 @@ CPPUNIT_TEST_FIXTURE(XHtmlExportTest, testTdf146264)
}
}
+CPPUNIT_TEST_FIXTURE(XHtmlExportTest, testTdf167910)
+{
+ createSwDoc("tdf167910.fodt");
+ setFilterOptions(u"UTF8"_ustr);
+ save(mpFilter);
+ SvStream* pStream = maTempFile.GetStream(StreamMode::READ);
+ CPPUNIT_ASSERT(pStream);
+ sal_uInt64 nLength = pStream->TellEnd();
+ OString aStream(read_uInt8s_ToOString(*pStream, nLength));
+ auto para1{ aStream.indexOf("text-decoration:underline;") };
+ CPPUNIT_ASSERT(para1 != -1);
+ auto para2{ aStream.indexOf("text-decoration:overline;", para1) };
+ CPPUNIT_ASSERT(para2 != -1);
+ auto para3{ aStream.indexOf("text-decoration:underline overline;", para2)
};
+ CPPUNIT_ASSERT(para3 != -1);
+ // the paragraph 4 is using commond style not automatic style and these
+ // are exported after all automatic ones...
+ auto para5{ aStream.indexOf("text-decoration:underline;", para3) };
+ CPPUNIT_ASSERT(para5 != -1);
+ auto para6{ aStream.indexOf("text-decoration: overline;", para5) };
+ CPPUNIT_ASSERT(para6 != -1);
+ // this one is style overridden by autostyle
+ auto para7{ aStream.indexOf("text-decoration:none ! important;", para6) };
+ CPPUNIT_ASSERT(para7 != -1);
+ auto para4style{ aStream.indexOf(".paragraph-underover", para7) };
+ CPPUNIT_ASSERT(para4style != -1);
+ auto para4{ aStream.indexOf("text-decoration:underline overline;",
para4style) };
+ CPPUNIT_ASSERT(para4 != -1);
+}
+
CPPUNIT_TEST_FIXTURE(XHtmlExportTest, testTdf118637)
{
createSwDoc("tdf118637.odt");
diff --git a/sw/qa/extras/odfexport/data/tdf167910.fodt
b/sw/qa/extras/odfexport/data/tdf167910.fodt
new file mode 100644
index 000000000000..e19d66aaef9f
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/tdf167910.fodt
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<office:document xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:c
alcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:
meta:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.4" office:mimetype="application/vnd.oasis.opendocument.text">
+
<office:meta><meta:creation-date>2025-08-11T19:11:33.842279014</meta:creation-date><dc:date>2025-08-12T12:21:59.269655750</dc:date><meta:editing-duration>PT10M23S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:generator>Collabora_OfficeDev/25.04.5.0$Linux_X86_64
LibreOffice_project/a8c445bb1ecf5a68c3925e3ab19d08f0b44644c9</meta:generator><meta:document-statistic
meta:table-count="0" meta:image-count="0" meta:object-count="0"
meta:page-count="1" meta:paragraph-count="7" meta:word-count="10"
meta:character-count="59"
meta:non-whitespace-character-count="56"/></office:meta>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation
Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans1" svg:font-family="'Noto Sans'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Serif CJK SC" svg:font-family="'Noto Serif
CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm"
draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm"
draw:start-line-spacing-vertical="0.283cm"
draw:end-line-spacing-horizontal="0.283cm"
draw:end-line-spacing-vertical="0.283cm" style:writing-mode="lr-tb"
style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:line-break="strict" loext:tab-stop-distance="0cm"
style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="de" fo:country="DE" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Noto Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:orphans="2" fo:widows="2"
fo:hyphenation-ladder-count="no-limit" fo:hyphenation-keep="auto"
loext:hyphenation-keep-type="column" style:text-autospace="ideograph-alpha"
style:punctuation-wrap="hanging" style:line-break="strict"
style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="12pt"
fo:language="de" fo:country="DE" style:letter-kerning="true"
style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt"
style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Noto Sans1" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false"
fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"
loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false"
loext:hyphenation-word-char-count="5" loext:hyphenation-zone="no-limit"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph"
style:class="text"/>
+ <style:style style:name="underover" style:family="paragraph"
style:parent-style-name="Standard" style:master-page-name="">
+ <style:paragraph-properties fo:margin-top="0.499cm" fo:margin-bottom="0cm"
style:contextual-spacing="false" style:page-number="auto"/>
+ <style:text-properties style:text-underline-style="solid"
style:text-underline-width="auto" style:text-underline-color="font-color"
style:text-overline-style="solid" style:text-overline-width="auto"
style:text-overline-color="font-color"/>
+ </style:style>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" loext:num-list-format="%1%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" loext:num-list-format="%2%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" loext:num-list-format="%3%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" loext:num-list-format="%4%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" loext:num-list-format="%5%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" loext:num-list-format="%6%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" loext:num-list-format="%7%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" loext:num-list-format="%8%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" loext:num-list-format="%9%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" loext:num-list-format="%10%"
style:num-format="">
+ <style:list-level-properties
text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1"
text:start-value="0" text:footnotes-position="page"
text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i"
text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false"
text:offset="0.499cm" style:num-format="1" text:number-position="left"
text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:margin-top="1cm" fo:margin-bottom="0cm"
style:contextual-spacing="false"/>
+ <style:text-properties style:text-underline-style="solid"
style:text-underline-width="auto" style:text-underline-color="font-color"/>
+ </style:style>
+ <style:style style:name="P2" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:margin-top="1cm" fo:margin-bottom="0cm"
style:contextual-spacing="false"/>
+ <style:text-properties style:text-overline-style="solid"
style:text-overline-width="auto" style:text-overline-color="font-color"/>
+ </style:style>
+ <style:style style:name="P3" style:family="paragraph"
style:parent-style-name="Standard">
+ <style:paragraph-properties fo:margin-top="1cm" fo:margin-bottom="0cm"
style:contextual-spacing="false"/>
+ <style:text-properties style:text-underline-style="solid"
style:text-underline-width="auto" style:text-underline-color="font-color"
style:text-overline-style="solid" style:text-overline-width="auto"
style:text-overline-color="font-color"/>
+ </style:style>
+ <style:style style:name="P4" style:family="paragraph"
style:parent-style-name="underover">
+ <style:text-properties style:text-overline-style="none"
style:text-overline-color="font-color"/>
+ </style:style>
+ <style:style style:name="P5" style:family="paragraph"
style:parent-style-name="underover">
+ <style:text-properties style:text-underline-style="none"/>
+ </style:style>
+ <style:style style:name="P6" style:family="paragraph"
style:parent-style-name="underover">
+ <style:text-properties style:text-underline-style="none"
style:text-overline-style="none" style:text-overline-color="font-color"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="21.001cm"
fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait"
fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm"
fo:margin-right="2cm" style:writing-mode="lr-tb"
style:layout-grid-color="#c0c0c0" style:layout-grid-lines="20"
style:layout-grid-base-height="0.706cm" style:layout-grid-ruby-height="0.353cm"
style:layout-grid-mode="none" style:layout-grid-ruby-below="false"
style:layout-grid-print="false" style:layout-grid-display="false"
style:footnote-max-height="0cm" loext:margin-gutter="0cm">
+ <style:footnote-sep style:width="0.018cm"
style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm"
style:line-style="solid" style:adjustment="left" style:rel-width="25%"
style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="full"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"
draw:style-name="dp1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0"
text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p text:style-name="P1">Under</text:p>
+ <text:p text:style-name="P2">over</text:p>
+ <text:p text:style-name="P3">underover</text:p>
+ <text:p text:style-name="underover">style underover</text:p>
+ <text:p text:style-name="P4">style under</text:p>
+ <text:p text:style-name="P5">style over</text:p>
+ <text:p text:style-name="P6">style</text:p>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
