From: Steve Coffman <gears@apache.org>
Date: Tue, 23 May 2000 17:14:11 +0000 (+0000)
Subject: These apply Jordon Naftolin's excellent table spacing fix. I'll apply this
X-Git-Tag: pre-columns~496
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ff34b5972b98fea8e4f1501c0e9ab0b99194d85f;p=xmlgraphics-fop.git

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 494f59718..440a53b4a 100644
--- 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 79c37bf69..503459fa4 100644
--- 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;
-	}
 }