From: Andreas L. Delmelle <adelmelle@apache.org>
Date: Sun, 14 Nov 2004 20:08:44 +0000 (+0000)
Subject: reverting previous change: 'outline' -> 'bookmark'
X-Git-Tag: Root_Temp_KnuthStylePageBreaking~363
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ca6a7e7846f2134eb3012847f1901fb16bc5332d;p=xmlgraphics-fop.git

reverting previous change: 'outline' -> 'bookmark'


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198144 13f79535-47bb-0310-9956-ffa450edef68
---

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);