Switch from strings->ints in Property.setSubprop() (from Finn Bock).

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197142 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/Property.java
index ed01900c3d8286625d54be7b31a60f0e1819f5be..0fd2ba732552cfdcf89b22947470c379fb46ca94 100644 (file)
--- a/src/java/org/apache/fop/fo/Property.java
+++ b/src/java/org/apache/fop/fo/Property.java
@@ -192,7 +192,8 @@ public class Property {
             if (spMaker != null) {
                 Property p = spMaker.make(propertyList, value, fo);
                 if (p != null) {
-                    return setSubprop(baseProp, partName, p);
+                    int partId = FOPropertyMapping.getSubPropertyId(partName);
+                    return setSubprop(baseProp, partId, p);
                 }
             } else {
                 //getLogger().error("compound property component "
@@ -210,12 +211,12 @@ public class Property {
          * compound properties.
          * @param baseProp The Property object representing the compound property,
          * such as SpaceProperty.
-         * @param partName The name of the component whose value is specified.
+         * @param partId The ID of the component whose value is specified.
          * @param subProp A Property object holding the specified value of the
          * component to be set.
          * @return The modified compound property object.
          */
-        protected Property setSubprop(Property baseProp, String partName,
+        protected Property setSubprop(Property baseProp, int partId,
                                       Property subProp) {
             return baseProp;
         }