Author: adelmelle
Date: Thu Jan 22 13:53:52 2009
New Revision: 736813
URL: http://svn.apache.org/viewvc?rev=736813&view=rev
Log:
Bugzilla 46567: fo:marker in fo:table-row produced a ValidationException
Added:
xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableRow.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableRow.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableRow.java?rev=736813&r1=736812&r2=736813&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableRow.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableRow.java
Thu Jan 22 13:53:52 2009
@@ -128,7 +128,12 @@
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);
}
}
Added: xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo?rev=736813&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo
(added)
+++ xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo
Thu Jan 22 13:53:52 2009
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<!--
+ see: http://issues.apache.org/bugzilla/show_bug.cgi?id=46567
+ Note: no real checks, should just run through without an error
+-->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="page"
+ page-height="15cm" page-width="15cm" margin="1cm">
+ <fo:region-body background-color="#F0F0F0" margin-top="1cm"/>
+ <fo:region-before extent="1cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="page">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:retrieve-marker retrieve-class-name="marker-in-table"
+ retrieve-position="first-starting-within-page"
retrieve-boundary="page"/>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-header>
+ <fo:table-cell><fo:block>Header 1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Header 2</fo:block></fo:table-cell>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:marker marker-class-name="marker-in-table"><fo:block>The
marker from the
+ table</fo:block></fo:marker>
+ <fo:table-cell><fo:block>Cell 1.1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 1.2</fo:block></fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell><fo:block>Cell 2.1</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>Cell 2.2</fo:block></fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
Propchange:
xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/trunk/test/fotree/testcases/table-row-marker_bug46567.fo
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
