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

diff --git a/src/codegen/properties.xsl b/src/codegen/properties.xsl
index a787e93e245cbc5586a92dc6a53b502d81042845..1c3a6fd98ffd1610b15e05893050e0c34879a9d8 100644 (file)
--- 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 0bfbf69eaa0ea68171bc63d57b704f51c8ae6d5e..343481dedf384ed6e674083db0845d5efcd86c1d 100644 (file)
--- 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;
     }