diff options
author | Simon Steiner <ssteiner@apache.org> | 2016-06-24 13:10:48 +0000 |
---|---|---|
committer | Simon Steiner <ssteiner@apache.org> | 2016-06-24 13:10:48 +0000 |
commit | 7c20b1bac93b712db6caeb5152e496aea9cb9910 (patch) | |
tree | 3aa8d787b3d941e574ca6860ba20d7c9b9da456d /fop-core | |
parent | f6d2baaf8a81ef6dfa077b3ddfa1c37d0ab3046e (diff) | |
download | xmlgraphics-fop-7c20b1bac93b712db6caeb5152e496aea9cb9910.tar.gz xmlgraphics-fop-7c20b1bac93b712db6caeb5152e496aea9cb9910.zip |
FOP-2614: Image missing on change IPD
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1750085 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop-core')
-rw-r--r-- | fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java index cc598ff88..36dd6f407 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java @@ -430,10 +430,13 @@ public abstract class AbstractBreaker { firstElementsForRestart = null; LayoutManager restartAtLM = getRestartAtLM(alg, ipdChangesOnNextPage, onLastPageAndIPDChanges, visitedBefore, blockList, 1); - if (restartAtLM == null) { + if (restartAtLM == null || restartAtLM.getChildLMs().isEmpty()) { firstElementsForRestart = null; - restartAtLM = getRestartAtLM(alg, ipdChangesOnNextPage, onLastPageAndIPDChanges, + LayoutManager restartAtLM2 = getRestartAtLM(alg, ipdChangesOnNextPage, onLastPageAndIPDChanges, visitedBefore, blockList, 0); + if (restartAtLM2 != null) { + restartAtLM = restartAtLM2; + } } if (ipdChangesOnNextPage) { addAreas(alg, optimalPageCount, blockList, blockList); |