Fixed a bug leading to the content of row-spanning cells being duplicated at page breaks, when it's small enough to fit on the previous row

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@629169 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 5 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
index d89f43370..c4bff5112 100644
--- a/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
+++ b/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
@@ -290,12 +290,14 @@ class ActiveCell {
      * @see #signalRowLastStep(int)
      */
     private void increaseCurrentStep(int limit) {
-        while (afterNextStep.totalLength <= limit && nextStep.breakClass == Constants.EN_AUTO) {
-            nextStep.set(afterNextStep);
-            if (afterNextStep.end >= elementList.size() - 1) {
-                break;
+        if (nextStep.end < elementList.size() - 1) {
+            while (afterNextStep.totalLength <= limit && nextStep.breakClass == Constants.EN_AUTO) {
+                nextStep.set(afterNextStep);
+                if (afterNextStep.end >= elementList.size() - 1) {
+                    break;
+                }
+                gotoNextLegalBreak();
             }
-            gotoNextLegalBreak();
         }
     }