For borders to be drawn properly on overflowed rows must process all children.

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

diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index 55b9bf4ea12aabab67e588d41123feda6043c2df..a95c92a3f0d007c06c559549819b1b8ed2f6f90d 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -398,7 +398,10 @@ public class TableRow extends FObj {
                                // added by Hani Elabed 11/27/2000
                                boolean someCellDidNotLayoutCompletely = false;
 
-                               for (int i = this.marker; i < numChildren; i++) {
+                               // If it takes multiple calls to completely layout the row, we need to process
+                               // all of the children (cells) not just those from the marker so that the borders
+                               // will be drawn properly.
+                               for (int i = 0; i < numChildren; i++) {
                                                TableCell cell = (TableCell) children.elementAt(i);
 
                                                // added by Hani Elabed 11/22/2000
@@ -433,15 +436,14 @@ public class TableRow extends FObj {
 
                                                                                // locate the first cell
                                                                                // that need to be laid out further
-
-                                                                               for (int j = 0; j < numChildren; j++) {
-                                                                                               CellState state = (CellState) cells.elementAt(j);
-
-                                                                                               if (! state.isLayoutComplete()) {
-                                                                                                               this.marker = j;
-                                                                                                               break; // out of for loop
-                                                                                               }
-                                                                               }
+                                                                               //for (int j = 0; j < numChildren; j++) {
+                                                                               //              CellState state = (CellState) cells.elementAt(j);
+                                                                               //
+                                                                               //              if (! state.isLayoutComplete()) {
+                                                                               //                              this.marker = j;
+                                                                               //                              break; // out of for loop
+                                                                               //              }
+                                                                               //}
                                                                } else {
                                                                                // added on 11/28/2000, by Dresdner Bank, Germany
                                                                                if (spacer != null) {