pietsch 2002/09/26 15:17:59
Modified: src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
TableRow.java
Log:
Moved table row ID creation so that the ID will always be created
if the row layout restarts.
PR: 12876
Revision Changes Path
No revision
No revision
1.51.2.6 +3 -6 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.51.2.5
retrieving revision 1.51.2.6
diff -u -r1.51.2.5 -r1.51.2.6
--- TableRow.java 26 Sep 2002 21:09:19 -0000 1.51.2.5
+++ TableRow.java 26 Sep 2002 22:17:58 -0000 1.51.2.6
@@ -209,8 +209,6 @@
}
public Status layout(Area area) throws FOPException {
- boolean configID = false;
-
if (this.marker == BREAK_AFTER) {
return new Status(Status.OK);
}
@@ -226,9 +224,9 @@
initCellArray();
// check to make sure this row hasn't been partially
// laid out yet (with an id created already)
- area.getIDReferences().createID(id);
- configID = true;
}
+ // create ID also in case the row has been reset
+ area.getIDReferences().createID(id);
this.marker = 0;
int breakStatus = propMgr.checkBreakBefore(area);
@@ -236,7 +234,6 @@
return new Status(breakStatus);
}
- // if (marker == 0 && configID) {
if (marker == 0) { // KDL: need to do this if thrown or if split?
// configure id
area.getIDReferences().configureID(id, area);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
