aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache
diff options
context:
space:
mode:
authorVincent Hennebert <vhennebert@apache.org>2009-11-24 14:48:52 +0000
committerVincent Hennebert <vhennebert@apache.org>2009-11-24 14:48:52 +0000
commitd61456f236d52c5d828b12d0ff684688d297b41b (patch)
treed18bcdbd74f5f298156f77c4539c92473e3b3649 /src/java/org/apache
parent62581cef4223490f296b3fae8dd3693aed146389 (diff)
downloadxmlgraphics-fop-d61456f236d52c5d828b12d0ff684688d297b41b.tar.gz
xmlgraphics-fop-d61456f236d52c5d828b12d0ff684688d297b41b.zip
Bugfix in Changing IPD: reset only the children LMs that have been created so far. Layout managers following a forced break have not even been created yet.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@883709 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache')
-rw-r--r--src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 82f0599eb..e6a5bea5e 100644
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -20,6 +20,7 @@
package org.apache.fop.layoutmgr;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
@@ -463,11 +464,8 @@ public abstract class AbstractLayoutManager extends AbstractBaseLayoutManager
isFinished = false;
curChildLM = null;
childLMiter = new LMiter(this);
- /*
- * Reset the children LM. Can't rely on childLMiter since it may have
- * been set to null in checkEndOfLayout.
- */
- for (LMiter iter = new LMiter(this); iter.hasNext();) {
+ /* Reset all the children LM that have been created so far. */
+ for (Iterator iter = getChildLMs().iterator(); iter.hasNext();) {
((LayoutManager) iter.next()).reset();
}
if (fobj != null) {