From 922d33c57d1ecf805bd42971d9db3bb90af23081 Mon Sep 17 00:00:00 2001 From: Robert Meyer Date: Wed, 4 Dec 2013 16:36:05 +0000 Subject: [PATCH] FOP-1069: No error message on illegal/unknown values on a property git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1547838 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/fo/properties/GenericShorthandParser.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java index 5c7bf4177..140b96aac 100644 --- a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java @@ -83,14 +83,17 @@ public class GenericShorthandParser implements ShorthandParser { PropertyList propertyList) throws PropertyException { Property prop = null; + String vProperty = ""; // Try each of the stored values in turn Iterator iprop = property.getList().iterator(); while (iprop.hasNext() && prop == null) { Property p = (Property)iprop.next(); + if (p.getNCname() != null) { + vProperty += p.getNCname() + " "; + } prop = maker.convertShorthandProperty(propertyList, p, null); - // The following produces a regression, about which see FOP-2311. - // propertyList.validatePropertyValue(p.getNCname(), prop, property); } + propertyList.validatePropertyValue(vProperty.trim(), prop, property); return prop; } -- 2.39.5