vmote 2003/08/26 12:28:46
Modified: src/java/org/apache/fop/apps Document.java
src/java/org/apache/fop/layoutmgr LayoutManagerLS.java
Log:
don't try to create bookmarks in output unless there are some in the input (getting
NPE)
Revision Changes Path
1.4 +2 -2 xml-fop/src/java/org/apache/fop/apps/Document.java
Index: Document.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Document.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Document.java 26 Aug 2003 17:15:14 -0000 1.3
+++ Document.java 26 Aug 2003 19:28:46 -0000 1.4
@@ -101,7 +101,7 @@
public AreaTree areaTree;
public AreaTreeModel atModel;
- private Bookmarks bookmarks;
+ private Bookmarks bookmarks = null;
/**
* Main constructor
1.10 +4 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java
Index: LayoutManagerLS.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManagerLS.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LayoutManagerLS.java 26 Aug 2003 17:15:14 -0000 1.9
+++ LayoutManagerLS.java 26 Aug 2003 19:28:46 -0000 1.10
@@ -139,6 +139,9 @@
* the extension to the area tree.
*/
public void addBookmarksToAreaTree() {
+ if (document.getBookmarks() == null) {
+ return;
+ }
document.getDriver().getLogger().debug("adding bookmarks to area tree");
BookmarkData data = new BookmarkData();
for (int count = 0; count < document.getBookmarks().getOutlines().size();
count++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
