From 6714301a9c568f357ed749ade4f0796dfe8142e7 Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Fri, 1 Nov 2013 20:58:48 +0000 Subject: 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 --- src/java/org/apache/fop/fo/properties/GenericShorthandParser.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/java') 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; } -- cgit v1.2.3