From a1ed5f808c718aa611aa641426711bde613552e6 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Thu, 27 Jan 2005 20:31:27 +0000 Subject: [PATCH] Fixed a bug in markers with boundary document and page-sequence. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198329 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/layoutmgr/PageSequenceLayoutManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java index e550962e4..41e0b3b3b 100644 --- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java @@ -388,14 +388,18 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager { boolean doc = boundary == EN_DOCUMENT; int seq = areaTreeModel.getPageSequenceCount(); int page = areaTreeModel.getPageCount(seq) - 1; + while (page < 0 && doc && seq > 1) { + seq--; + page = areaTreeModel.getPageCount(seq) - 1; + } while (page >= 0) { PageViewport pv = areaTreeModel.getPage(seq, page); - mark = (Marker)curPage.getMarker(name, pos); + mark = (Marker)pv.getMarker(name, pos); if (mark != null) { return mark; } page--; - if (page == -1 && doc && seq > 0) { + if (page < 0 && doc && seq > 1) { seq--; page = areaTreeModel.getPageCount(seq) - 1; } -- 2.39.5