XHTML export: Removing former 'ugly' - now redundant- fix added by

tdf146264 as now made redundant by prior changes

Change-Id: I6747e33d1ffd4812d8881e10cda2300e7d79e1b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151468
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

1 files changed, 3 insertions, 17 deletions

diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
index 59636c5835f7..de1e9750aa43 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
@@ -367,7 +367,6 @@
                     <xsl:call-template name="create-paragraph">
                         <xsl:with-param name="globalData" select="$globalData" />
                         <xsl:with-param name="footnotePrefix" select="$footnotePrefix" />
-                        <xsl:with-param name="frameFloating" select="true()"/>
                     </xsl:call-template>
                 </xsl:if>
 
@@ -702,7 +701,6 @@
         <xsl:param name="globalData"/>
         <!-- the footnote symbol is the prefix for a footnote in the footer -->
         <xsl:param name="footnotePrefix"/>
-        <xsl:param name="frameFloating"/>
 
         <!-- xhtml:p may only contain inline elements.
              If there is one frame beyond, div must be used! -->
@@ -825,7 +823,6 @@
         <xsl:param name="leftPosition" select="0" />
         <xsl:param name="parentMarginLeft" />
         <xsl:param name="stopAtFirstFrame" select="false()" />
-        <xsl:param name="frameFloating" select="false()" />
 
         <xsl:choose>
             <xsl:when test="name() = 'draw:frame' and not($stopAtFirstFrame)">
@@ -835,7 +832,6 @@
                     <xsl:with-param name="previousFrameWidths" select="$previousFrameWidths"/>
                     <xsl:with-param name="previousFrameHeights" select="$previousFrameHeights"/>
                     <xsl:with-param name="parentMarginLeft" select="$parentMarginLeft"/>
-                    <xsl:with-param name="frameFloating" select="true()"/>
                 </xsl:call-template>
                 <!-- next elements will be called after the creation with the new indent (plus width of frame) -->
             </xsl:when>
@@ -855,14 +851,9 @@
                                 <xsl:value-of select="$leftPosition"/>
                                 <xsl:text>cm;</xsl:text>
                             </xsl:attribute>
-                            <!-- This xsl:if is the meat of the extremely ugly "fix" to tdf#146264. It probably has unintended
-                                 bad side-effects.
-                            -->
-                            <xsl:if test="not($frameFloating)">
-                                <xsl:apply-templates select=".">
-                                    <xsl:with-param name="globalData" select="$globalData"/>
-                                </xsl:apply-templates>
-                            </xsl:if>
+                            <xsl:apply-templates select=".">
+                                <xsl:with-param name="globalData" select="$globalData"/>
+                            </xsl:apply-templates>
                             <!-- if it is a frame sibling it will be NOT encapsulated within the div (as already within one) -->
                             <xsl:if test="not($nextSiblingIsFrame)">
                                 <xsl:apply-templates select="following-sibling::node()[1]" mode="frameFloating">
@@ -933,13 +924,11 @@
         <xsl:param name="globalData"/>
         <xsl:param name="previousFrameWidths" select="0"/>
         <xsl:param name="previousFrameHeights" select="0" />
-        <xsl:param name="frameFloating" select="false()" />
 
         <xsl:call-template name="createDrawFrame">
             <xsl:with-param name="globalData" select="$globalData" />
             <xsl:with-param name="previousFrameWidths" select="$previousFrameWidths"/>
             <xsl:with-param name="previousFrameHeights" select="$previousFrameHeights"/>
-            <xsl:with-param name="frameFloating" select="$frameFloating"/>
         </xsl:call-template>
         <!-- after the last draw:frame sibling the CSS float is disabled -->
         <xsl:if test="@text:anchor-type!='as-char'">
@@ -983,7 +972,6 @@
         <xsl:param name="previousFrameHeights" select="0" />
         <xsl:param name="parentMarginLeft"/>
         <xsl:param name="stopAtFirstFrame" select="false()" />
-        <xsl:param name="frameFloating" select="false()" />
 
         <xsl:variable name="parentMarginLeftNew">
             <xsl:choose>
@@ -1063,7 +1051,6 @@
             <xsl:with-param name="parentMarginLeftNew" select="$parentMarginLeftNew"/>
             <xsl:with-param name="leftPosition" select="$leftPosition"/>
             <xsl:with-param name="svgY" select="$svgY"/>
-            <xsl:with-param name="frameFloating" select="$frameFloating"/>
         </xsl:call-template>
     </xsl:template>
 
@@ -2603,7 +2590,6 @@
             <xsl:apply-templates>
                 <xsl:with-param name="globalData" select="$globalData"/>
                 <xsl:with-param name="listIndent" select="$minLabelWidth"/>
-                <xsl:with-param name="frameFloating" select="true()"/>
             </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>