You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2001/01/04 08:06:45 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow TableRow.java TableCell.java
keiron 01/01/03 23:06:45
Modified: src/org/apache/fop/fo/flow TableRow.java TableCell.java
Log:
fixes cell and row heights
Revision Changes Path
1.33 +2 -1 xml-fop/src/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TableRow.java 2001/01/03 23:14:37 1.32
+++ TableRow.java 2001/01/04 07:06:44 1.33
@@ -1,4 +1,4 @@
-/*-- $Id: TableRow.java,v 1.32 2001/01/03 23:14:37 keiron Exp $ --
+/*-- $Id: TableRow.java,v 1.33 2001/01/04 07:06:44 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -542,6 +542,7 @@
}
area.addChild(areaContainer);
+ areaContainer.setHeight(largestCellHeight);
areaAdded = true;
areaContainer.end();
area.addDisplaySpace(largestCellHeight +
1.22 +3 -4 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TableCell.java 2000/12/19 20:15:27 1.21
+++ TableCell.java 2001/01/04 07:06:44 1.22
@@ -1,4 +1,4 @@
-/*-- $Id: TableCell.java,v 1.21 2000/12/19 20:15:27 jordan Exp $ --
+/*-- $Id: TableCell.java,v 1.22 2001/01/04 07:06:44 keiron Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -284,7 +284,6 @@
} else {
// hani Elabed 11/21/2000
area.addChild(areaContainer);
-// area.setHeight(getHeight());
area.setAbsoluteHeight(areaContainer.getAbsoluteHeight());
return new Status(Status.AREA_FULL_SOME);
@@ -296,8 +295,8 @@
height = getHeight();
top = areaContainer.getCurrentYPosition();
- area.setHeight(getHeight());
// reset absoluteHeight to beginning of row
+ area.setHeight(getHeight());
area.setAbsoluteHeight(originalAbsoluteHeight);
return new Status(Status.OK);
@@ -308,7 +307,7 @@
}
public void setRowHeight(int h) {
- areaContainer.setMaxHeight(height);
+ areaContainer.setMaxHeight(h);
switch(verticalAlign) {
case VerticalAlign.MIDDLE:
areaContainer.setHeight(height);