move creation of bookmarks in AreaTree from LayoutManagerLS to Document, so that...

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

diff --git a/src/java/org/apache/fop/apps/Document.java b/src/java/org/apache/fop/apps/Document.java
index b284c5dfb30a4156d135ec673c3e5a7433306bef..453438fefb781d684f6dd87d1e16c59be26c87e0 100644 (file)
--- a/src/java/org/apache/fop/apps/Document.java
+++ b/src/java/org/apache/fop/apps/Document.java
@@ -344,6 +344,7 @@ public class Document implements FOTreeControl, FOTreeListener,
      */
     public void foPageSequenceComplete (FOTreeEvent event) throws FOPException {
         PageSequence pageSeq = event.getPageSequence();
+        areaTree.addBookmarksToAreaTree();
         layoutStrategy.format(pageSeq, areaTree);
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
index c63281b5fb9105d59f6ef4be16d05cc016786c11..53ce038bdca7ee56235386133b8d595c046a015a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
@@ -94,8 +94,6 @@ public class LayoutManagerLS extends LayoutStrategy {
             return;
         }
 
-        areaTree.addBookmarksToAreaTree();
-
         // Initialize if already used?
         //    this.layoutMasterSet.resetPageMasters();
         if (pageSeq.getPageSequenceMaster() != null) {