rpms/openoffice.org/devel openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.4, 1.5 openoffice.org.spec, 1.2026, 1.2027

[David Tardon]

Author: dtardon

Update of /cvs/extras/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9872

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
	openoffice.org.spec 
Log Message:
fix newly introduced cases of variable shadowing in XHTML export filter

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:
 export/spreadsheetml/formular.xsl |    6 +++---
 export/uof/odf2uof_text.xsl       |    8 +-------
 odf2xhtml/export/xhtml/body.xsl   |    8 ++++----
 3 files changed, 8 insertions(+), 14 deletions(-)

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	10 Oct 2009 15:48:46 -0000	1.4
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	12 Oct 2009 12:47:27 -0000	1.5
@@ -1,3 +1,34 @@
+Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+===================================================================
+--- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(revision 276736)
++++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	(working copy)
+@@ -106,8 +144,8 @@
+                 </xsl:when>
+                 <xsl:otherwise>
+                     <!-- As CSS writing-mode is not implemented by all browsers, a heuristic is done -->
+-                    <xsl:variable name="writingMode" select="key('writingModeStyles', 'test')"/>
+-                    <xsl:if test="contains($writingMode, 'rl')">
++                    <xsl:variable name="writingModeTest" select="key('writingModeStyles', 'test')"/>
++                    <xsl:if test="contains($writingModeTest, 'rl')">
+                         <xsl:attribute name="dir">rtl</xsl:attribute>
+                     </xsl:if>
+                 </xsl:otherwise>
+@@ -564,13 +602,13 @@
+         </xsl:variable>
+         <xsl:choose>
+             <xsl:when test="$tabIndent='NaN'">
+-                <xsl:variable name="tabPosition">
++                <xsl:variable name="tabPositionTmp">
+                     <xsl:call-template name="convert2cm">
+                         <xsl:with-param name="value" select="$tabStops/style:tab-stop[last()]/@style:position"/>
+                     </xsl:call-template>
+                 </xsl:variable>
+ 					<!-- Heuristic: for every tab that is more than specified give a further 1 cm -->
+-                <xsl:value-of select="$parentMarginLeft + $tabPosition + count($tabStops/style:tab-stop) - $tabCount"/>
++                <xsl:value-of select="$parentMarginLeft + $tabPositionTmp + count($tabStops/style:tab-stop) - $tabCount"/>
+             </xsl:when>
+             <xsl:otherwise>
+                 <xsl:value-of select="$tabIndent"/>
 diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
 --- filter.orig/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:14.000000000 +0100
 +++ filter/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:57.000000000 +0100


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/extras/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2026
retrieving revision 1.2027
diff -u -p -r1.2026 -r1.2027
--- openoffice.org.spec	12 Oct 2009 09:33:04 -0000	1.2026
+++ openoffice.org.spec	12 Oct 2009 12:47:27 -0000	1.2027
@@ -4182,6 +4182,7 @@ fi
 - add workspace.dba32h.patch
 - Resolves: rhbz#528409 [si_LK] Default font in oowriter is not
   Language Default (LKLUG), but DejaVu Sans (dtardon)
+- update openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch (dtardon)
 
 * Thu Oct 08 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
 - merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch