klease 01/07/11 14:27:40
Modified: src/org/apache/fop/fo/flow TableRow.java
Log:
Fix spanning bug; use height property
Revision Changes Path
1.46 +6 -5 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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- TableRow.java 2001/07/04 21:16:02 1.45
+++ TableRow.java 2001/07/11 21:27:36 1.46
@@ -1,4 +1,4 @@
-/*-- $Id: TableRow.java,v 1.45 2001/07/04 21:16:02 klease Exp $ --
+/*-- $Id: TableRow.java,v 1.46 2001/07/11 21:27:36 klease Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -43,7 +43,7 @@
int widthOfCellsSoFar = 0;
int largestCellHeight = 0;
-
+ int minHeight = 0; // force row height
Vector columns;
AreaContainer areaContainer;
@@ -81,8 +81,8 @@
* Otherwise return value >= input value.
*/
int getNextFreeCell(int colNum) {
- for (int i=colNum-1; i<cells.length; i++) {
- if (cells[i] == null) return i+1;
+ for (int i=colNum-1; i<states.length; i++) {
+ if (states[i] == EMPTY) return i+1;
}
return -1;
}
@@ -194,6 +194,7 @@
this.keepWithPrevious = getKeepValue("keep-with-previous.within-column");
this.id = this.properties.get("id").getString();
+ this.minHeight = this.properties.get("height").getLength().mvalue();
setup = true;
}
@@ -264,7 +265,7 @@
areaContainer.setAbsoluteHeight(area.getAbsoluteHeight());
areaContainer.setIDReferences(area.getIDReferences());
- largestCellHeight = 0;
+ largestCellHeight = minHeight;
// Flag indicaing whether any cell didn't fit in available space
boolean someCellDidNotLayoutCompletely = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
