From d9ccf5f4edf32a42fa2e8eb285b7133fc6191239 Mon Sep 17 00:00:00 2001 From: "Andreas L. Delmelle" Date: Thu, 26 Jun 2008 19:44:20 +0000 Subject: Fixed a possible NullPointerException: if the citation appears in a fo:marker, the property will only be parsed if the marker is retrieved... git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@672010 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/fo/flow/AbstractPageNumberCitation.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java b/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java index b45f21348..58c0f4547 100644 --- a/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java @@ -22,6 +22,7 @@ package org.apache.fop.fo.flow; import java.awt.Color; import org.xml.sax.Locator; +import org.xml.sax.Attributes; import org.apache.fop.apps.FOPException; import org.apache.fop.datatypes.Length; @@ -104,13 +105,18 @@ public abstract class AbstractPageNumberCitation extends FObj { } /** {@inheritDoc} */ - protected void startOfNode() throws FOPException { - super.startOfNode(); - if (refId.equals("")) { + public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException { + super.processNode(elementName, locator, attlist, pList); + if (!inMarker() && (refId == null || "".equals(refId))) { missingPropertyError("ref-id"); } } + /** {@inheritDoc} */ + protected void startOfNode() throws FOPException { + super.startOfNode(); + } + /** * {@inheritDoc} *
XSL Content Model: empty -- cgit v1.2.3