/[pkgs]/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
ViewVC logotype

Contents of /rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.5 - (show annotations) (download) (as text)
Mon Oct 12 12:47:27 2009 UTC (5 weeks, 6 days ago) by dtardon
Branch: MAIN
CVS Tags: openoffice_org-3_2_0-2_2_fc13, openoffice_org-3_2_0-2_1_fc13, openoffice_org-3_2_0-4_2_fc13, openoffice_org-3_2_0-2_4_fc13, openoffice_org-3_2_0-1_2_fc13, openoffice_org-3_2_0-4_1_fc13, openoffice_org-3_2_0-2_3_fc13, openoffice_org-3_2_0-5_1_fc13, openoffice_org-3_2_0-3_1_fc13, openoffice_org-3_2_0-3_2_fc13, openoffice_org-3_2_0-1_1_fc13, openoffice_org-3_2_0-2_5_fc13, openoffice_org-3_2_0-3_4_fc13, HEAD
Changes since 1.4: +31 -0 lines
File MIME type: text/x-patch 
fix newly introduced cases of variable shadowing in XHTML export filter
1 Index: filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
2 ===================================================================
3 --- filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (revision 276736)
4 +++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl (working copy)
5 @@ -106,8 +144,8 @@
6 </xsl:when>
7 <xsl:otherwise>
8 <!-- As CSS writing-mode is not implemented by all browsers, a heuristic is done -->
9 - <xsl:variable name="writingMode" select="key('writingModeStyles', 'test')"/>
10 - <xsl:if test="contains($writingMode, 'rl')">
11 + <xsl:variable name="writingModeTest" select="key('writingModeStyles', 'test')"/>
12 + <xsl:if test="contains($writingModeTest, 'rl')">
13 <xsl:attribute name="dir">rtl</xsl:attribute>
14 </xsl:if>
15 </xsl:otherwise>
16 @@ -564,13 +602,13 @@
17 </xsl:variable>
18 <xsl:choose>
19 <xsl:when test="$tabIndent='NaN'">
20 - <xsl:variable name="tabPosition">
21 + <xsl:variable name="tabPositionTmp">
22 <xsl:call-template name="convert2cm">
23 <xsl:with-param name="value" select="$tabStops/style:tab-stop[last()]/@style:position"/>
24 </xsl:call-template>
25 </xsl:variable>
26 <!-- Heuristic: for every tab that is more than specified give a further 1 cm -->
27 - <xsl:value-of select="$parentMarginLeft + $tabPosition + count($tabStops/style:tab-stop) - $tabCount"/>
28 + <xsl:value-of select="$parentMarginLeft + $tabPositionTmp + count($tabStops/style:tab-stop) - $tabCount"/>
29 </xsl:when>
30 <xsl:otherwise>
31 <xsl:value-of select="$tabIndent"/>
32 diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
33 --- filter.orig/source/xslt/export/spreadsheetml/formular.xsl 2009-04-24 09:31:14.000000000 +0100
34 +++ filter/source/xslt/export/spreadsheetml/formular.xsl 2009-04-24 09:31:57.000000000 +0100
35 @@ -381,7 +381,7 @@
36 </xsl:when>
37 <xsl:otherwise>
38 <xsl:value-of select="$earlierCandidate" />
39 - <xsl:variable name="parameterCandidate">
40 + <xsl:variable name="parameterCandidate2">
41 <xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
42 <xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
43 <xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
44 @@ -405,8 +405,8 @@
45 <xsl:call-template name="getParameter">
46 <xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
47 <xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
48 - <xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
49 - <xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
50 + <xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
51 + <xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
52 <xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
53 </xsl:call-template>
54 </xsl:otherwise>
55 diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
56 --- filter.orig/source/xslt/export/uof/odf2uof_text.xsl 2009-04-24 09:31:14.000000000 +0100
57 +++ filter/source/xslt/export/uof/odf2uof_text.xsl 2009-04-24 09:32:29.000000000 +0100
58 @@ -4029,13 +4029,7 @@
59 <xsl:element name="字:文本串">
60 <xsl:attribute name="uof:locID">t0109</xsl:attribute>
61 <xsl:attribute name="uof:attrList">标识符</xsl:attribute>
62 - <xsl:variable name="stt">
63 - <xsl:value-of select="./text:a"/>
64 - </xsl:variable>
65 - <xsl:variable name="end">
66 - <xsl:value-of select="."/>
67 - </xsl:variable>
68 - <xsl:value-of select="substring-after($end,$stt)"/>
69 + <xsl:value-of select="$bijiao"/>
70 </xsl:element>
71 </xsl:if>
72 </字:句>
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2