aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjtauber <jtauber@unknown>1999-11-26 08:31:57 +0000
committerjtauber <jtauber@unknown>1999-11-26 08:31:57 +0000
commit2ba1afad0b04bb9c385cd3460e1fb3c1caa2c31d (patch)
treeb8b14903780504d721ea408bd93a99574d000bec /src
parent98740b52cea9f6a5fa920aa5b64e8aa1ee824c45 (diff)
downloadxmlgraphics-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
Diffstat (limited to 'src')
-rw-r--r--src/org/apache/fop/fo/flow/TableCell.java4
-rw-r--r--src/org/apache/fop/fo/flow/TableRow.java3
2 files changed, 5 insertions, 2 deletions
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);