diff options
| author | Glen Mazza <gmazza@apache.org> | 2004-01-09 03:05:55 +0000 |
|---|---|---|
| committer | Glen Mazza <gmazza@apache.org> | 2004-01-09 03:05:55 +0000 |
| commit | cbe4125cd6fb95868d1b7b1c4d2d92eccb03a249 (patch) | |
| tree | 626f5fb842744c5af2d1d34065aa30fc1e861ae7 | |
| parent | ca7ccdd769a9002e39a2d158d814f20707eea7d1 (diff) | |
| download | xmlgraphics-fop-cbe4125cd6fb95868d1b7b1c4d2d92eccb03a249.tar.gz xmlgraphics-fop-cbe4125cd6fb95868d1b7b1c4d2d92eccb03a249.zip | |
Bug 25990 (Patch by Finn Bock) errors in String->int conversions found.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197148 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/codegen/properties.xsl | 10 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/PropertyList.java | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl index a787e93e2..1c3a6fd98 100644 --- a/src/codegen/properties.xsl +++ b/src/codegen/properties.xsl @@ -1003,7 +1003,15 @@ public class </xsl:text> <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> diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java index 0bfbf69ea..343481ded 100644 --- a/src/java/org/apache/fop/fo/PropertyList.java +++ b/src/java/org/apache/fop/fo/PropertyList.java @@ -385,8 +385,8 @@ public class PropertyList extends HashMap { 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; } |