From: Keiron Liddle <keiron@apache.org>
Date: Tue, 19 Nov 2002 07:00:27 +0000 (+0000)
Subject: correctly continue lists over page
X-Git-Tag: Alt-Design-integration-base~322
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=49ab95481c7149ae4e80a099eb4be2d390bccbd5;p=xmlgraphics-fop.git

correctly continue lists over page


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

diff --git a/src/org/apache/fop/layoutmgr/list/Item.java b/src/org/apache/fop/layoutmgr/list/Item.java
index 029c864e9..d55bd7cf8 100644
--- a/src/org/apache/fop/layoutmgr/list/Item.java
+++ b/src/org/apache/fop/layoutmgr/list/Item.java
@@ -102,6 +102,7 @@ public class Item extends BlockStackingLayoutManager {
                         } else {
                             curLM.resetPosition(null);
                         }
+                        over = true;
                         break;
                     }
                     stackSize.add(bp.getStackingSize());
@@ -234,6 +235,7 @@ public class Item extends BlockStackingLayoutManager {
         if (resetPos == null) {
             reset(null);
         } else {
+            setFinished(false);
             //reset(resetPos);
         }
     }
diff --git a/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index e495f0c44..2b76a860d 100644
--- a/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -35,10 +35,9 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
     private Item label;
     private Item body;
 
-    private Block curBlockArea;
+    private Block curBlockArea = null;
 
     private List cellList = null;
-    private List columns = null;
     private int listItemHeight;
     private BorderAndPadding borderProps = null;
     private BackgroundProps backgroundProps;
@@ -171,7 +170,10 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
 
         MinOptMax itemSize = new MinOptMax(min, opt, max);
 
-        setFinished(true);
+        if (label.isFinished() && body.isFinished()) {
+            setFinished(true);
+        }
+
         ItemPosition rp = new ItemPosition(this, breakList.size() - 1, breakList);
         BreakPoss breakPoss = new BreakPoss(rp);
         if (over) { 
@@ -217,6 +219,7 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
 
         flush();
 
+        curBlockArea = null;
     }
 
     /**