From dafacc3ff595328433b87b0c75bc706b2d451aa2 Mon Sep 17 00:00:00 2001 From: "Andreas L. Delmelle" Date: Thu, 22 Jan 2009 21:53:52 +0000 Subject: Bugzilla 46567: fo:marker in fo:table-row produced a ValidationException git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@736813 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/fo/flow/table/TableRow.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/java/org/apache/fop/fo/flow') diff --git a/src/java/org/apache/fop/fo/flow/table/TableRow.java b/src/java/org/apache/fop/fo/flow/table/TableRow.java index a40b550bc..2feb45d86 100644 --- a/src/java/org/apache/fop/fo/flow/table/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/table/TableRow.java @@ -128,7 +128,12 @@ public class TableRow extends TableCellContainer implements BreakPropertySet { String localName) throws ValidationException { if (FO_URI.equals(nsURI)) { - if (!localName.equals("table-cell")) { + if ("marker".equals(localName)) { + if (this.firstChild != null) { + //a table-cell has already been added to this row + nodesOutOfOrderError(loc, "fo:marker", "(table-cell+)"); + } + } else if (!"table-cell".equals(localName)) { invalidChildError(loc, nsURI, localName); } } -- cgit v1.2.3