diff options
| author | Glenn Adams <gadams@apache.org> | 2013-11-01 20:58:48 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2013-11-01 20:58:48 +0000 |
| commit | 6714301a9c568f357ed749ade4f0796dfe8142e7 (patch) | |
| tree | 6d5fdd6bda0a847df75dfb4506ed0183e8f09d3f /src/java | |
| parent | 8841c3bdd571ff02ff4e99dbce355b78127e4190 (diff) | |
| download | xmlgraphics-fop-6714301a9c568f357ed749ade4f0796dfe8142e7.tar.gz xmlgraphics-fop-6714301a9c568f357ed749ade4f0796dfe8142e7.zip | |
FOP-2311: revert changes from FOP-1069 that regresses shorthand property handling.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1538062 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/GenericShorthandParser.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java index ac3d4d13a..5c7bf4177 100644 --- a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java @@ -88,7 +88,8 @@ public class GenericShorthandParser implements ShorthandParser { while (iprop.hasNext() && prop == null) { Property p = (Property)iprop.next(); prop = maker.convertShorthandProperty(propertyList, p, null); - propertyList.validatePropertyValue(p.getNCname(), prop, property); + // The following produces a regression, about which see FOP-2311. + // propertyList.validatePropertyValue(p.getNCname(), prop, property); } return prop; } |