adelmelle 2004/11/14 11:28:29
Modified: src/java/org/apache/fop/fo/pagination Root.java
Log:
changed 'bookmarks' to 'outline' to avoid ValidateException for bookmarks
extension
Revision Changes Path
1.34 +5 -5 xml-fop/src/java/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Root.java 29 Oct 2004 11:19:37 -0000 1.33
+++ Root.java 14 Nov 2004 19:28:28 -0000 1.34
@@ -104,7 +104,7 @@
} else if (declarations != null) {
tooManyNodesError(loc, "fo:declarations");
} else if (bookmarks != null) {
- nodesOutOfOrderError(loc, "fo:declarations",
"fox:bookmarks");
+ nodesOutOfOrderError(loc, "fo:declarations",
"fox:outline");
} else if (pageSequenceFound) {
nodesOutOfOrderError(loc, "fo:declarations",
"fo:page-sequence");
}
@@ -118,14 +118,14 @@
invalidChildError(loc, nsURI, localName);
}
} else if (nsURI.equals(ExtensionElementMapping.URI)) {
- if (!localName.equals("bookmarks")) {
+ if (!localName.equals("outline")) {
invalidChildError(loc, nsURI, localName);
} else if (layoutMasterSet == null) {
- nodesOutOfOrderError(loc, "fo:layout-master-set",
"fox:bookmarks");
+ nodesOutOfOrderError(loc, "fo:layout-master-set",
"fox:outline");
} else if (bookmarks != null) {
- tooManyNodesError(loc, "fox:bookmarks");
+ tooManyNodesError(loc, "fox:outline");
} else if (pageSequenceFound) {
- nodesOutOfOrderError(loc, "fox:bookmarks",
"fo:page-sequence");
+ nodesOutOfOrderError(loc, "fox:outline", "fo:page-sequence");
}
} else {
invalidChildError(loc, nsURI, localName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
