diff options
author | Vincent Hennebert <vhennebert@apache.org> | 2011-03-21 16:46:53 +0000 |
---|---|---|
committer | Vincent Hennebert <vhennebert@apache.org> | 2011-03-21 16:46:53 +0000 |
commit | 1337f45867b9e8e97da1b4672260b674721a172c (patch) | |
tree | 58825e77093df18c7481183d0bc6bcbc60541356 /src | |
parent | c5e6d82c6c6497e17b03a45de2a8883814ef2421 (diff) | |
download | xmlgraphics-fop-1337f45867b9e8e97da1b4672260b674721a172c.tar.gz xmlgraphics-fop-1337f45867b9e8e97da1b4672260b674721a172c.zip |
Bugfix: keep-together on a table containing row-spanning cells was not honored
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1083863 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r-- | src/java/org/apache/fop/layoutmgr/table/TableStepper.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java index 92e8ba5dd..7e37eeb59 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java @@ -239,7 +239,7 @@ public class TableStepper { } } - Keep keep = Keep.KEEP_AUTO; + Keep keep = getTableLM().getKeepTogether(); int stepPenalty = 0; for (Iterator iter = activeCells.iterator(); iter.hasNext();) { ActiveCell activeCell = (ActiveCell) iter.next(); @@ -248,8 +248,6 @@ public class TableStepper { } if (!rowFinished) { keep = keep.compare(rowGroup[activeRowIndex].getKeepTogether()); - //The above call doesn't take the penalty from the table into account, so... - keep = keep.compare(getTableLM().getKeepTogether()); } else if (activeRowIndex < rowGroup.length - 1) { keep = keep.compare(rowGroup[activeRowIndex].getKeepWithNext()); keep = keep.compare(rowGroup[activeRowIndex + 1].getKeepWithPrevious()); |