diff options
author | Jeremias Maerki <jeremias@apache.org> | 2007-03-12 21:49:37 +0000 |
---|---|---|
committer | Jeremias Maerki <jeremias@apache.org> | 2007-03-12 21:49:37 +0000 |
commit | 74de788d25c893ebf1bb9d4d284f9928b89b062e (patch) | |
tree | 06e49b4915f4016d6988c9fba5fb91219a316b49 /src | |
parent | f7a78a276ea6cb557e3a1f5e4f690e0e90515a55 (diff) | |
download | xmlgraphics-fop-74de788d25c893ebf1bb9d4d284f9928b89b062e.tar.gz xmlgraphics-fop-74de788d25c893ebf1bb9d4d284f9928b89b062e.zip |
Fixed an IllegalArgumentException for absolutely positioned block-containers with a border and no height/bpd set.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@517415 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r-- | src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index e99b966ef..e63345f77 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -431,6 +431,8 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager } } } else { + int maxbpd = context.getStackLimit().opt; + allocBPD = maxbpd; autoHeight = true; } } else { @@ -503,7 +505,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager MinOptMax range = new MinOptMax(relDims.ipd); BlockContainerBreaker breaker = new BlockContainerBreaker(this, range); - breaker.doLayout(relDims.bpd, autoHeight); + breaker.doLayout((autoHeight ? 0 : relDims.bpd), autoHeight); boolean contentOverflows = breaker.isOverflow(); LinkedList returnList = new LinkedList(); if (!breaker.isEmpty()) { |