bckfnn 2004/10/10 13:24:16 Modified: src/java/org/apache/fop/layoutmgr RetrieveMarkerLayoutManager.java Log: Fix regression for fo:retrieve-marker. Revision Changes Path 1.11 +11 -1 xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java Index: RetrieveMarkerLayoutManager.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/RetrieveMarkerLayoutManager.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- RetrieveMarkerLayoutManager.java 7 Sep 2004 20:47:11 -0000 1.10 +++ RetrieveMarkerLayoutManager.java 10 Oct 2004 20:24:16 -0000 1.11 @@ -20,6 +20,7 @@ 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 @@ 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 @@ 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);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]