diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2011-03-26 22:35:30 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2011-03-26 22:35:30 +0000 |
| commit | a4d39cf19441af2e8c6222c576110359b71a1a70 (patch) | |
| tree | d1924764e785d713b24f077413279286d27b6d6a /src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java | |
| parent | c0388acf51d54ca414b91bb06941f041fd09497a (diff) | |
| download | xmlgraphics-fop-a4d39cf19441af2e8c6222c576110359b71a1a70.tar.gz xmlgraphics-fop-a4d39cf19441af2e8c6222c576110359b71a1a70.zip | |
Bugzilla 50965: Fix regression in BlockContainerLayoutManager where margins were not reset after forced breaks.
Thanks to Martin Koegler.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1085820 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 7b29db895..95b7f8a39 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -346,6 +346,9 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager updateContentAreaIPDwithOverconstrainedAdjust(contentWidth); } + contentRectOffsetX = 0; + contentRectOffsetY = 0; + contentRectOffsetX += fo.getCommonMarginBlock().startIndent.getValue(this); contentRectOffsetY += fo.getCommonBorderPaddingBackground().getBorderBeforeWidth(false); contentRectOffsetY += fo.getCommonBorderPaddingBackground().getPaddingBefore(false, this); |