filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 7
+++----
sw/qa/extras/htmlexport/xhtmlexport.cxx | 2
+-
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 26271331c8da8c872f29463d9c390b1b570eb020
Author: Svante Schubert <svante.schub...@gmail.com>
AuthorDate: Mon Aug 24 17:22:41 2020 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Mar 2 13:22:27 2021 +0100
HTML XSLT: Overtaking masking ' for ODF font-family with spaces in names
Change-Id: I718fc232a3903d0b449a4c9a4ef4dff601744756
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111615
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
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 d4418725f2fc..c81cc9a1e0be 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
@@ -214,12 +214,11 @@
<xsl:template match="@style:font-name">
<xsl:param name="globalData" />
- <xsl:text>font-family:"</xsl:text>
+ <xsl:text>font-family:</xsl:text>
<xsl:variable name="content" select="."/>
- <xsl:variable name="quote">'</xsl:variable>
<xsl:variable name="fontName"
select="$globalData/office:font-face-decls/style:font-face[@style:name=$content]/@svg:font-family"
/>
- <xsl:value-of select="translate($fontName, $quote, '')"/>
- <xsl:text>"; </xsl:text>
+ <xsl:value-of select="$fontName"/>
+ <xsl:text>; </xsl:text>
</xsl:template>
<xsl:template match="@style:row-height">
diff --git a/sw/qa/extras/htmlexport/xhtmlexport.cxx
b/sw/qa/extras/htmlexport/xhtmlexport.cxx
index 218bb4772eb4..f60d8b912fad 100644
--- a/sw/qa/extras/htmlexport/xhtmlexport.cxx
+++ b/sw/qa/extras/htmlexport/xhtmlexport.cxx
@@ -49,7 +49,7 @@ DECLARE_HTMLEXPORT_TEST(testTdf131812, "tdf131812.odt")
sal_uInt64 nLength = pStream->TellEnd();
OString aStream(read_uInt8s_ToOString(*pStream, nLength));
CPPUNIT_ASSERT(
- aStream.indexOf(".P1 { font-size:12pt; font-family:\"Liberation
Serif\"; "
+ aStream.indexOf(".P1 { font-size:12pt; font-family:\'Liberation
Serif\'; "
"writing-mode:horizontal-tb; direction:rtl;
text-align:right ! important;}")
!= -1);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
