diff options
author | Finn Bock <bckfnn@apache.org> | 2004-10-10 20:24:16 +0000 |
---|---|---|
committer | Finn Bock <bckfnn@apache.org> | 2004-10-10 20:24:16 +0000 |
commit | fc25cbc20600512ed2d17454954b89d6bde935df (patch) | |
tree | e2a0ea15275d82bd953d103a11cbf7f95bdd8b11 | |
parent | cc09df3c74c65614eb69b1a3479211da7c392477 (diff) | |
download | xmlgraphics-fop-fc25cbc20600512ed2d17454954b89d6bde935df.tar.gz xmlgraphics-fop-fc25cbc20600512ed2d17454954b89d6bde935df.zip |
Fix regression for fo:retrieve-marker.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198030 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java index 21834e719..5a0f074bd 100644 --- a/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java @@ -20,6 +20,7 @@ package org.apache.fop.layoutmgr; import java.util.ArrayList; import java.util.List; +import java.util.LinkedList; import org.apache.fop.area.Area; import org.apache.fop.fo.flow.Marker; @@ -62,6 +63,15 @@ public class RetrieveMarkerLayoutManager extends AbstractLayoutManager { return replaceLM.getNextBreakPoss(context); } + public LinkedList getNextKnuthElements(LayoutContext context, + int alignment) { + loadLM(); + if (replaceLM == null) { + return null; + } + return replaceLM.getNextKnuthElements(context, alignment); + } + public void addAreas(PositionIterator parentIter, LayoutContext layoutContext) { @@ -96,7 +106,7 @@ public class RetrieveMarkerLayoutManager extends AbstractLayoutManager { List list = new ArrayList(); Marker marker = retrieveMarker(name, position, boundary); if (marker != null) { - marker.addLayoutManager(markerLMList); + marker.addLayoutManager(list); if (list.size() > 0) { replaceLM = (LayoutManager)list.get(0); replaceLM.setParent(this); |