filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl | 2
+
filter/source/xslt/odf2xhtml/export/common/styles/style_mapping_css.xsl | 11
++++++----
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 6aabe09ac092c51d4b394bde9c7ea0055b952e33
Author: Peter Jentsch <pj...@guineapics.de>
Date: Mon Nov 26 01:26:37 2012 +0100
fix fdo#56596 - FILESAVE: huge excesses of white space in xhtml...
Change-Id: Ideb395c1f1bc22d5b23d1c949ec6221e04590a2e
diff --git
a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
index b95cda7..9b02d94 100644
--- a/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/styles/style_collector.xsl
@@ -800,6 +800,8 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
+ <!-- workaround AOOO#119401 suspicious property fo:margin="100%" in
paragraph style -->
+ <xsl:template match="@fo:margin[string(.) = '100%']"
mode="paragraphMerge"/>
<xsl:template mode="paragraphMerge" match="@fo:margin | @fo:margin-top
| @fo:margin-bottom | @fo:margin-left | @fo:margin-right">
<xsl:text>padding</xsl:text>
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 785f9bd..1dedcc2 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
@@ -83,10 +83,13 @@
<xsl:text>; </xsl:text>
</xsl:template>
- <!-- Maps fo:margin as well fo:margin-top, fo:margin-bottom,
fo:padding-left, fo:margin-right -->
- <!-- Maps fo:padding as well fo:padding-top, fo:padding-bottom,
fo:padding-left, fo:padding-right -->
- <xsl:template match="@fo:letter-spacing | @fo:line-height | @fo:width
|@fo:margin | @fo:margin-top | @fo:margin-bottom | @fo:margin-left |
@fo:margin-right | @fo:padding | @fo:padding-top | @fo:padding-bottom |
@fo:padding-left | @fo:padding-right">
- <xsl:value-of select="substring-after(name(), ':')"/>
+ <!-- workaround AOOO#119401 suspicious property fo:margin="100%" in
paragraph style -->
+ <xsl:template match="@fo:margin[string(.) = '100%']"/>
+
+ <!-- Maps fo:margin as well fo:margin-top, fo:margin-bottom,
fo:padding-left, fo:margin-right -->
+ <!-- Maps fo:padding as well fo:padding-top, fo:padding-bottom,
fo:padding-left, fo:padding-right -->
+ <xsl:template match="@fo:letter-spacing | @fo:line-height | @fo:width
|@fo:margin | @fo:margin-top | @fo:margin-bottom | @fo:margin-left |
@fo:margin-right | @fo:padding | @fo:padding-top | @fo:padding-bottom |
@fo:padding-left | @fo:padding-right">
+ <xsl:value-of select="local-name(.)"/>
<xsl:text>:</xsl:text>
<!-- Map once erroneusly used inch shortage 'inch' to CSS
shortage 'in' -->
<xsl:choose>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
