gmazza 2004/01/08 19:05:55
Modified: src/codegen properties.xsl
src/java/org/apache/fop/fo PropertyList.java
Log:
Bug 25990 (Patch by Finn Bock) errors in String->int conversions found.
Revision Changes Path
1.30 +10 -2 xml-fop/src/codegen/properties.xsl
Index: properties.xsl
===================================================================
RCS file: /home/cvs/xml-fop/src/codegen/properties.xsl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- properties.xsl 7 Jan 2004 22:25:42 -0000 1.29
+++ properties.xsl 9 Jan 2004 03:05:55 -0000 1.30
@@ -1003,7 +1003,15 @@
<xsl:param name="lrtb"/>
<xsl:param name="rltb"/>
<xsl:param name="tbrl"/>
- <xsl:text>propertyList.wmMap(Constants.PR_</xsl:text>
+ <xsl:choose>
+ <xsl:when test="parwmrel2abs">
+ <xsl:text>parentFO.propertyList</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>propertyList</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>.wmMap(Constants.PR_</xsl:text>
<xsl:apply-templates mode="x">
<xsl:with-param name="dir" select='$lrtb'/>
</xsl:apply-templates>
1.24 +2 -2 xml-fop/src/java/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PropertyList.java 7 Jan 2004 22:50:51 -0000 1.23
+++ PropertyList.java 9 Jan 2004 03:05:55 -0000 1.24
@@ -385,8 +385,8 @@
public int wmMap(int lrtb, int rltb, int tbrl) {
switch (writingMode) {
case WritingMode.LR_TB: return lrtb;
- case WritingMode.RL_TB: return lrtb;
- case WritingMode.TB_RL: return lrtb;
+ case WritingMode.RL_TB: return rltb;
+ case WritingMode.TB_RL: return tbrl;
}
return -1;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
