Each column in the row should start with the same height available.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194224 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 a95c92a3f0d007c06c559549819b1b8ed2f6f90d..1e1dcc4d93f2d007c61877a372e032c02a4e82f5 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -326,6 +326,7 @@ public class TableRow extends FObj {
                                }
 
                                int spaceLeft = area.spaceLeft();
+                               int origMaxHeight = area.getMaxHeight();
                                this.areaContainer =
                                                new AreaContainer(propMgr.getFontState(area.getFontInfo()),
                                                                                                                        0,0,
@@ -419,6 +420,13 @@ public class TableRow extends FObj {
                                                //--- change by Hani Elabed 11/22/2000
                                                cell.setStartOffset(cellState.getWidthOfCellSoFar());
 
+                                               // Each column in the row should start with the same height available
+                                               if ( i > 0 )
+                                               {
+                                                       areaContainer.increaseHeight(areaContainer.spaceLeft() - areaContainer.getMaxHeight() - spaceLeft + origMaxHeight);
+                                                       areaContainer.setMaxHeight(spaceLeft);
+                                               }
+
                                                Status status;
                                                if ((status = cell.layout(areaContainer)).isIncomplete()) {
                                                                this.marker = i;