diff options
| author | Keiron Liddle <keiron@apache.org> | 2002-11-19 07:00:27 +0000 |
|---|---|---|
| committer | Keiron Liddle <keiron@apache.org> | 2002-11-19 07:00:27 +0000 |
| commit | 49ab95481c7149ae4e80a099eb4be2d390bccbd5 (patch) | |
| tree | 6f19efa690c2935e69e276d46cd804871a9e6f5c /src | |
| parent | a5a563208c5afef691fd76082e726f1defff261d (diff) | |
| download | xmlgraphics-fop-49ab95481c7149ae4e80a099eb4be2d390bccbd5.tar.gz xmlgraphics-fop-49ab95481c7149ae4e80a099eb4be2d390bccbd5.zip | |
correctly continue lists over page
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195560 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/apache/fop/layoutmgr/list/Item.java | 2 | ||||
| -rw-r--r-- | src/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 9 |
2 files changed, 8 insertions, 3 deletions
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; } /** |