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 kl...@apache.org on 2001/04/20 23:00:32 UTC
cvs commit: xml-fop/src/org/apache/fop/fo/flow TableBody.java
klease 01/04/20 14:00:32
Modified: src/org/apache/fop/fo/flow TableBody.java
Log:
Fix body positioning; remove widow and orhpan handling for rows
Revision Changes Path
1.32 +31 -31 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TableBody.java 2001/04/11 21:42:44 1.31
+++ TableBody.java 2001/04/20 21:00:31 1.32
@@ -1,4 +1,4 @@
-/*-- $Id: TableBody.java,v 1.31 2001/04/11 21:42:44 klease Exp $ --
+/*-- $Id: TableBody.java,v 1.32 2001/04/20 21:00:31 klease Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -153,7 +153,7 @@
*/
this.areaContainer =
new AreaContainer(propMgr.getFontState(area.getFontInfo()),
- 0,area.getHeight(),
+ 0,area.getContentHeight(),
area.getContentWidth(), // IPD
area.spaceLeft(),
Position.RELATIVE);
@@ -220,38 +220,38 @@
}
}
this.marker = i;
- if ((i != 0) &&
+ if ((i != 0) &&
(status.getCode() == Status.AREA_FULL_NONE)) {
status = new Status(Status.AREA_FULL_SOME);
}
- if (i < widows && numChildren >= widows) {
- resetMarker();
- return new Status(Status.AREA_FULL_NONE);
- }
- if (numChildren <= orphans) {
- resetMarker();
- return new Status(Status.AREA_FULL_NONE);
- }
- if (numChildren - i < orphans && numChildren >= orphans) {
- for (int count = i;
- count > numChildren - orphans - 1; count--) {
- row = (TableRow) children.elementAt(count);
- row.removeLayout(areaContainer);
- i--;
- }
- if (i < widows && numChildren >= widows) {
- resetMarker();
- return new Status(Status.AREA_FULL_NONE);
- }
- this.marker = i;
- area.addChild(areaContainer);
- //areaContainer.end();
-
- area.increaseHeight(areaContainer.getHeight());
- area.setAbsoluteHeight(
- areaContainer.getAbsoluteHeight());
- return new Status(Status.AREA_FULL_SOME);
- }
+// if (i < widows && numChildren >= widows) {
+// resetMarker();
+// return new Status(Status.AREA_FULL_NONE);
+// }
+// if (numChildren <= orphans) {
+// resetMarker();
+// return new Status(Status.AREA_FULL_NONE);
+// }
+// if (numChildren - i < orphans && numChildren >= orphans) {
+// for (int count = i;
+// count > numChildren - orphans - 1; count--) {
+// row = (TableRow) children.elementAt(count);
+// row.removeLayout(areaContainer);
+// i--;
+// }
+// if (i < widows && numChildren >= widows) {
+// resetMarker();
+// return new Status(Status.AREA_FULL_NONE);
+// }
+// this.marker = i;
+// area.addChild(areaContainer);
+// //areaContainer.end();
+
+// area.increaseHeight(areaContainer.getHeight());
+// area.setAbsoluteHeight(
+// areaContainer.getAbsoluteHeight());
+// return new Status(Status.AREA_FULL_SOME);
+// }
if (!((i == 0) &&
(areaContainer.getContentHeight() <= 0))) {
area.addChild(areaContainer);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org