table bug fixes from Eric Schaeffer. cells/rows were increasing the height of their...

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

diff --git a/STATUS b/STATUS
index b377a8fefd40cf9fea94767905cbabc5a9a9a340..5499d011c1979f399d9e0abcfe7dd8fea1d347f2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 29188e2e59e535a8cfb0a5fe1d5d936252dba21c..0a5f69b252d56c45e531fe6ccc528bd5cebb2bda 100644 (file)
--- 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 401436983cc7dbd55a39b8297141787671ad3bab..bd015378ce6786b1749fc989e6eb20cc30af491e 100644 (file)
--- 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);