diff options
| author | jtauber <jtauber@unknown> | 1999-11-26 08:31:57 +0000 |
|---|---|---|
| committer | jtauber <jtauber@unknown> | 1999-11-26 08:31:57 +0000 |
| commit | 2ba1afad0b04bb9c385cd3460e1fb3c1caa2c31d (patch) | |
| tree | b8b14903780504d721ea408bd93a99574d000bec | |
| parent | 98740b52cea9f6a5fa920aa5b64e8aa1ee824c45 (diff) | |
| download | xmlgraphics-fop-2ba1afad0b04bb9c385cd3460e1fb3c1caa2c31d.tar.gz xmlgraphics-fop-2ba1afad0b04bb9c385cd3460e1fb3c1caa2c31d.zip | |
table bug fixes from Eric Schaeffer. cells/rows were increasing the height of their parent area twice
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193247 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | STATUS | 4 | ||||
| -rw-r--r-- | src/org/apache/fop/fo/flow/TableCell.java | 4 | ||||
| -rw-r--r-- | src/org/apache/fop/fo/flow/TableRow.java | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -4,14 +4,14 @@ STATUS Things to do before releasing as 0.12.0: -Make sure Makefiles work +[DONE] Make sure Makefiles work Get images working [PARTIAL] Incorporate Arved Sandstrom's simple-link implementation [DONE] Switch to using Status object as return from layout() [PARTIAL] Implement basic keeps [DONE]Incorporate Eric Schaeffer's fix to tables in static-content [DONE] Incorporate Kelly Campell's fixes to GifJpegImage -Incorporate Eric Schaeffer's further table fixes +[PARTIAL] Incorporate Eric Schaeffer's further table fixes Incorporate Eric Schaeffer's background colour implementation Other Bugs to fix: diff --git a/src/org/apache/fop/fo/flow/TableCell.java b/src/org/apache/fop/fo/flow/TableCell.java index 29188e2e5..0a5f69b25 100644 --- a/src/org/apache/fop/fo/flow/TableCell.java +++ b/src/org/apache/fop/fo/flow/TableCell.java @@ -160,7 +160,9 @@ public class TableCell extends FObj { return new Status(Status.AREA_FULL_SOME); } } - height += blockArea.getHeight(); + // bug fix from Eric Schaeffer + // height += blockArea.getHeight(); + height = blockArea.getHeight(); } blockArea.end(); diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java index 401436983..bd015378c 100644 --- a/src/org/apache/fop/fo/flow/TableRow.java +++ b/src/org/apache/fop/fo/flow/TableRow.java @@ -191,7 +191,8 @@ public class TableRow extends FObj { blockArea.end(); area.addChild(blockArea); area.addDisplaySpace(largestCellHeight); - area.increaseHeight(largestCellHeight); + // bug fix from Eric Schaeffer + //area.increaseHeight(largestCellHeight); if (spaceAfter != 0) { area.addDisplaySpace(spaceAfter); |