cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr PageSequenceLayoutManager.java

[jeremias]

jeremias    2005/01/27 12:31:27

  Modified:    src/java/org/apache/fop/layoutmgr
                        PageSequenceLayoutManager.java
  Log:
  Fixed a bug in markers with boundary document and page-sequence.
  
  Revision  Changes    Path
  1.25      +7 -3      
xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
  
  Index: PageSequenceLayoutManager.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- PageSequenceLayoutManager.java    26 Jan 2005 17:51:55 -0000      1.24
  +++ PageSequenceLayoutManager.java    27 Jan 2005 20:31:27 -0000      1.25
  @@ -388,14 +388,18 @@
               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;
                   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]