Fix missing shorthands.

PR: 26423
Submitted by: Simon Pepping

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

diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java
index f993d7c1f39ea3c36897c86a1b054b840f87110e..1bc932696aa474aa89c42729593e6408d69cc96b 100644 (file)
--- a/src/java/org/apache/fop/fo/FOPropertyMapping.java
+++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java
@@ -412,9 +412,9 @@ public class FOPropertyMapping implements Constants {
      */
     public static Property.Maker[] getGenericMappings() {
         FOPropertyMapping gp = new FOPropertyMapping();
-        gp.createGenerics();
         // Create the shorthand first, they are referenced by the real properties. 
         gp.createShorthandProperties();
+        gp.createGenerics();
         gp.createAccessibilityProperties();
         gp.createAbsolutePositionProperties();
         gp.createAuralProperties();

diff --git a/src/java/org/apache/fop/fo/Property.java b/src/java/org/apache/fop/fo/Property.java
index 998068eb88a179fc255d41d09e7c9b8e93935d01..41a017b7586b8554e72cfaafda84ba3ec16a02fe 100644 (file)
--- a/src/java/org/apache/fop/fo/Property.java
+++ b/src/java/org/apache/fop/fo/Property.java
@@ -117,7 +117,7 @@ public class Property {
             inherited = generic.inherited;
             defaultValue = generic.defaultValue;
             percentBase = generic.percentBase;
-            if (shorthands != null) {
+            if (generic.shorthands != null) {
                 shorthands = new Property.Maker[generic.shorthands.length];
                 System.arraycopy(shorthands, 0, generic.shorthands, 0, shorthands.length);
             }