diff options
Diffstat (limited to 'src/java/org')
-rw-r--r-- | src/java/org/apache/fop/layoutmgr/table/TableStepper.java | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java index 0ce81f351..91f430e98 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java @@ -208,7 +208,7 @@ public class TableStepper { getTableLM().getHalfBorderSeparationBPD(), rowGroup)); } } - for (int i = activeRowIndex + 1; i < rowGroup.length; i++) { + for (int i = activeRowIndex + (rowBacktrackForLastStep ? 0 : 1); i < rowGroup.length; i++) { maxW += rowGroup[i].getHeight().opt; } log.debug("maxRemainingHeight=" + maxW); @@ -258,11 +258,6 @@ public class TableStepper { LinkedList returnList = new LinkedList(); while ((step = getNextStep()) >= 0) { int normalRow = activeRowIndex; - if (rowBacktrackForLastStep) { - //Even though we've already switched to the next row, we have to - //calculate as if we were still on the previous row - activeRowIndex--; - } int increase = step - laststep; int penaltyLen = step + getMaxRemainingHeight() - totalHeight; int boxLen = step - addedBoxLen - penaltyLen; @@ -394,10 +389,6 @@ public class TableStepper { } laststep = step; - if (rowBacktrackForLastStep) { - //If row was set to previous, restore now - activeRowIndex++; - } } if (signalKeepWithNext) { //Last step signalled a keep-with-next. Since the last penalty will be removed, |