diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2008-03-14 12:22:44 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2008-03-14 12:22:44 +0000 |
| commit | b0644700fd13beb3286888fbea4dd4a0461d6d54 (patch) | |
| tree | dd70e1d55d64a7ee172930d72cb4ed451346975f /src/java/org/apache/fop/layoutmgr | |
| parent | 5ed52d9f31436a693484dd9179b422c544b004bb (diff) | |
| download | xmlgraphics-fop-b0644700fd13beb3286888fbea4dd4a0461d6d54.tar.gz xmlgraphics-fop-b0644700fd13beb3286888fbea4dd4a0461d6d54.zip | |
Reverting changes of rev. 637057. I applied the changes to the 0.95 branch instead so that they make their way into the 0.95 release. I will merge them back to the Trunk via svnmerge
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@637076 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr')
3 files changed, 6 insertions, 8 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index 5e5613898..435f25b48 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -386,9 +386,6 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager } addKnuthElementsForBorderPaddingAfter(returnList, true); addKnuthElementsForSpaceAfter(returnList, alignment); - - //All child content is processed. Only break-after can occur now, so... - context.clearPendingMarks(); addKnuthElementsForBreakAfter(returnList, context); setFinished(true); diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java index 96e2c82fb..541912a08 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -393,9 +393,6 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager addKnuthElementsForBorderPaddingAfter(returnList, true); addKnuthElementsForSpaceAfter(returnList, alignment); - - //All child content is processed. Only break-after can occur now, so... - context.clearPendingMarks(); if (forcedBreakAfterLast == null) { addKnuthElementsForBreakAfter(returnList, context); } diff --git a/src/java/org/apache/fop/layoutmgr/LayoutContext.java b/src/java/org/apache/fop/layoutmgr/LayoutContext.java index 79b5e232f..a72fca9af 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutContext.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutContext.java @@ -285,8 +285,12 @@ public class LayoutContext { * Clears all pending marks on the LayoutContext. */ public void clearPendingMarks() { - this.pendingBeforeMarks = null; - this.pendingAfterMarks = null; + if (this.pendingBeforeMarks != null) { + this.pendingBeforeMarks.clear(); + } + if (this.pendingAfterMarks != null) { + this.pendingAfterMarks.clear(); + } } /** |