[PATCH 17/17] XHTML export: remove 'odfLiEnd'

andrew-libreoffice.org at pileofstuff.org andrew-libreoffice.org at pileofstuff.org
Thu Aug 14 14:53:57 PDT 2014


From: Andrew Sayers <andrew-libreoffice.org at pileofstuff.org>

Inserting space to work around an IE6/7 bug does more harm than good nowadays.
---
 filter/source/xslt/odf2xhtml/export/xhtml/body.xsl   | 6 ------
 filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 5 -----
 2 files changed, 11 deletions(-)

diff --git filter/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index bbf90d5..245da83 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -2559,9 +2559,6 @@
 				<xsl:with-param name="globalData" select="$globalData"/>
 				<xsl:with-param name="listIndent" select="$minLabelWidth"/>
 			</xsl:apply-templates>
-			<!-- this span disables the float necessary to bring two block elements on one line. It contains a space as IE6 bug workaround -->
-			<span class="odfLiEnd"></span>
-			<xsl:text>&#x200b;</xsl:text>
 		</xsl:element>
 
 		<xsl:apply-templates mode="list-item-children" select="following-sibling::*[1]">
@@ -2628,9 +2625,6 @@
 				</xsl:apply-templates>
 			</xsl:element>
 
-			<!-- this span disables the float necessary to bring two block elements on one line. It contains a space as IE6 bug workaround -->
-			<span class="odfLiEnd"></span>
-			<xsl:text>&#x200b;</xsl:text>
 		</xsl:element>
 
 		<xsl:apply-templates mode="list-item-children" select="following-sibling::*[1]">
diff --git filter/source/xslt/odf2xhtml/export/xhtml/header.xsl filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index f76c451..d0db766 100644
--- filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -99,11 +99,6 @@
 	</xsl:text>
 <xsl:text>li { list-style: none; margin:0; padding:0;}
 	</xsl:text>
-<xsl:comment> "li span.odfLiEnd" - IE 7 issue</xsl:comment>
-<xsl:text>
-	</xsl:text>
-<xsl:text>li span. { clear: both; line-height:0; width:0; height:0; margin:0; padding:0; }
-	</xsl:text>
 <xsl:text>span.footnodeNumber { padding-right:1em; }
 	</xsl:text>
 <xsl:text>span.annotation_style_by_filter { font-size:95%; font-family:Arial; background-color:#fff000;  margin:0; border:0; padding:0;  }
-- 
1.8.5.1



More information about the LibreOffice mailing list