diff options
| author | Karen Lease <klease@apache.org> | 2001-07-11 21:27:36 +0000 |
|---|---|---|
| committer | Karen Lease <klease@apache.org> | 2001-07-11 21:27:36 +0000 |
| commit | 6f86d3a94d6e257e3b5892c0151ee62d117b1f29 (patch) | |
| tree | 7f8fc87631ba54b27cb823a915e79e383081ae5f /src | |
| parent | 8dfcbfd87d94252bac49d501287b6f96bb424dc2 (diff) | |
| download | xmlgraphics-fop-6f86d3a94d6e257e3b5892c0151ee62d117b1f29.tar.gz xmlgraphics-fop-6f86d3a94d6e257e3b5892c0151ee62d117b1f29.zip | |
Fix spanning bug; use height property
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194347 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/apache/fop/fo/flow/TableRow.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java index 4a885b56b..455f6996b 100644 --- a/src/org/apache/fop/fo/flow/TableRow.java +++ b/src/org/apache/fop/fo/flow/TableRow.java @@ -43,7 +43,7 @@ public class TableRow extends FObj { int widthOfCellsSoFar = 0; int largestCellHeight = 0; - + int minHeight = 0; // force row height Vector columns; AreaContainer areaContainer; @@ -81,8 +81,8 @@ public class TableRow extends FObj { * 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 @@ public class TableRow extends FObj { 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 @@ public class TableRow extends FObj { 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; |