fixes cell and row heights

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

diff --git a/src/org/apache/fop/fo/flow/TableCell.java b/src/org/apache/fop/fo/flow/TableCell.java
index 76df8df3c395d2c810f1d581b91f9d6fe9e13a56..5543af2f3ddaa341f5a5bb1b826d53b45cb08b49 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableCell.java
+++ b/src/org/apache/fop/fo/flow/TableCell.java
@@ -284,7 +284,6 @@ public class TableCell extends FObj {
                } else {
                                        // hani Elabed 11/21/2000
                         area.addChild(areaContainer);
-//             area.setHeight(getHeight());
                area.setAbsoluteHeight(areaContainer.getAbsoluteHeight());
 
                    return new Status(Status.AREA_FULL_SOME);
@@ -296,8 +295,8 @@ public class TableCell extends FObj {
 
        height = getHeight();
        top = areaContainer.getCurrentYPosition();
-       area.setHeight(getHeight());
        // reset absoluteHeight to beginning of row
+       area.setHeight(getHeight());
        area.setAbsoluteHeight(originalAbsoluteHeight);
 
        return new Status(Status.OK);
@@ -308,7 +307,7 @@ public class TableCell extends FObj {
     }
     
     public void setRowHeight(int h) {
-       areaContainer.setMaxHeight(height);
+        areaContainer.setMaxHeight(h);
            switch(verticalAlign) {
                case VerticalAlign.MIDDLE:
                    areaContainer.setHeight(height);

diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index fdb7f2a8b022112c563a07fdc9316e9e57771f02..604a13bb71d77d4663f71ee6059ec493b7cb5c6c 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -542,6 +542,7 @@ public class TableRow extends FObj {
         }
 
         area.addChild(areaContainer);
+        areaContainer.setHeight(largestCellHeight);
         areaAdded = true;
         areaContainer.end();
         area.addDisplaySpace(largestCellHeight +