From 480aca5871304b1e690f13bafdfe0bb857b0b940 Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Wed, 11 Apr 2012 18:52:19 +0000 Subject: [PATCH] Must use unqualified (local name) when reporting invalid child error. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1324916 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/flow/Marker.java | 2 +- src/java/org/apache/fop/fo/flow/RetrieveMarker.java | 2 +- status.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index bff5fac0c..de806e986 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -59,7 +59,7 @@ public class Marker extends FObjMixed { /** {@inheritDoc} */ public void bind(PropertyList pList) throws FOPException { if (findAncestor(FO_FLOW) < 0) { - invalidChildError(locator, getParent().getName(), FO_URI, getName(), + invalidChildError(locator, getParent().getName(), FO_URI, getLocalName(), "rule.markerDescendantOfFlow"); } diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index 5ddc1f304..5fc70c7f2 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -60,7 +60,7 @@ public class RetrieveMarker extends AbstractRetrieveMarker { PropertyList pList) throws FOPException { if (findAncestor(FO_STATIC_CONTENT) < 0) { - invalidChildError(locator, getParent().getName(), FO_URI, getName(), + invalidChildError(locator, getParent().getName(), FO_URI, getLocalName(), "rule.retrieveMarkerDescendantOfStaticContent"); } else { super.processNode(elementName, locator, attlist, pList); diff --git a/status.xml b/status.xml index 67d915353..c6b3e22f9 100644 --- a/status.xml +++ b/status.xml @@ -62,6 +62,9 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> + + Must use unqualified (local name) when reporting invalid child error. + Restore lookup on Event message lookup field part. Add locale field to Event to enable locale dependent deferred bundle load during lookup field part substitution. -- 2.39.5