diff options
| author | Keiron Liddle <keiron@apache.org> | 2001-01-04 07:06:44 +0000 |
|---|---|---|
| committer | Keiron Liddle <keiron@apache.org> | 2001-01-04 07:06:44 +0000 |
| commit | 2ea890ae77901120eb67c7eacf46f4f7381ca20c (patch) | |
| tree | 3fa72133b652d7e0d961b9ec0ff716870abb6836 /src | |
| parent | d9fc7b76e86d09625647a56e4d81d63bcb2dda4f (diff) | |
| download | xmlgraphics-fop-2ea890ae77901120eb67c7eacf46f4f7381ca20c.tar.gz xmlgraphics-fop-2ea890ae77901120eb67c7eacf46f4f7381ca20c.zip | |
fixes cell and row heights
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193950 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/apache/fop/fo/flow/TableCell.java | 5 | ||||
| -rw-r--r-- | src/org/apache/fop/fo/flow/TableRow.java | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/org/apache/fop/fo/flow/TableCell.java b/src/org/apache/fop/fo/flow/TableCell.java index 76df8df3c..5543af2f3 100644 --- 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 fdb7f2a8b..604a13bb7 100644 --- 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 + |