These apply Jordon Naftolin's excellent table spacing fix. I'll apply this

to 0.13 later on as well.

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

diff --git a/src/org/apache/fop/fo/flow/TableBody.java b/src/org/apache/fop/fo/flow/TableBody.java
index 494f59718eb111afd5774e5b59923ee78bc893aa..440a53b4a3bc328ca27487f80eccc0cc43398c9d 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableBody.java
+++ b/src/org/apache/fop/fo/flow/TableBody.java
@@ -156,11 +156,6 @@ public class TableBody extends FObj {
                area.increaseHeight(areaContainer.getHeight());
                return status;
            }
-               // if this is not the last row, add display space
-               if(i!=numChildren-1)
-               {
-                       areaContainer.addDisplaySpace(row.getLargestCellHeight());
-               }
        }
        area.addChild(areaContainer);
        areaContainer.end();

diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index 79c37bf695656ff0a116dc8bc8ab425f038b50a6..503459fa47cf7cd36cee8de0d844d79cf7477145 100644 (file)
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -185,7 +185,7 @@ public class TableRow extends FObj {
                }
                area.addChild(areaContainer);
                //areaContainer.end();
-               area.increaseHeight(areaContainer.getHeight());
+               area.addDisplaySpace(areaContainer.getHeight());
                return status;
            }
 
@@ -201,7 +201,7 @@ public class TableRow extends FObj {
 
        area.addChild(areaContainer);
        areaContainer.end();
-        area.setHeight(largestCellHeight);
+        area.addDisplaySpace(largestCellHeight);
 
        // bug fix from Eric Schaeffer
        //area.increaseHeight(largestCellHeight);
@@ -220,8 +220,4 @@ public class TableRow extends FObj {
     public int getAreaHeight() {
        return areaContainer.getHeight();
     }
-       public int getLargestCellHeight()
-       {
-               return largestCellHeight;
-       }
 }