aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2004-11-14 20:08:44 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2004-11-14 20:08:44 +0000
commitca6a7e7846f2134eb3012847f1901fb16bc5332d (patch)
treefbc7275d677cefe7b70fb02441ff85dd942ae075 /src/java/org/apache
parente105612bacfd8b9bf685548bbf37ae27b3decb89 (diff)
downloadxmlgraphics-fop-ca6a7e7846f2134eb3012847f1901fb16bc5332d.tar.gz
xmlgraphics-fop-ca6a7e7846f2134eb3012847f1901fb16bc5332d.zip
reverting previous change: 'outline' -> 'bookmark'
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198144 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache')
-rw-r--r--src/java/org/apache/fop/fo/pagination/Root.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index 1e3dec03b..de8aa6310 100644
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -104,7 +104,7 @@ public class Root extends FObj {
} else if (declarations != null) {
tooManyNodesError(loc, "fo:declarations");
} else if (bookmarks != null) {
- nodesOutOfOrderError(loc, "fo:declarations", "fox:outline");
+ nodesOutOfOrderError(loc, "fo:declarations", "fox:bookmark");
} else if (pageSequenceFound) {
nodesOutOfOrderError(loc, "fo:declarations", "fo:page-sequence");
}
@@ -118,14 +118,14 @@ public class Root extends FObj {
invalidChildError(loc, nsURI, localName);
}
} else if (nsURI.equals(ExtensionElementMapping.URI)) {
- if (!localName.equals("outline")) {
+ if (!localName.equals("bookmark")) {
invalidChildError(loc, nsURI, localName);
} else if (layoutMasterSet == null) {
- nodesOutOfOrderError(loc, "fo:layout-master-set", "fox:outline");
+ nodesOutOfOrderError(loc, "fo:layout-master-set", "fox:bookmark");
} else if (bookmarks != null) {
- tooManyNodesError(loc, "fox:outline");
+ tooManyNodesError(loc, "fox:bookmark");
} else if (pageSequenceFound) {
- nodesOutOfOrderError(loc, "fox:outline", "fo:page-sequence");
+ nodesOutOfOrderError(loc, "fox:bookmark", "fo:page-sequence");
}
} else {
invalidChildError(loc, nsURI, localName);