diff options
Diffstat (limited to 'src/java/org/apache/fop/fo/flow/table')
-rw-r--r-- | src/java/org/apache/fop/fo/flow/table/EffRow.java | 11 | ||||
-rw-r--r-- | src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java | 9 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/java/org/apache/fop/fo/flow/table/EffRow.java b/src/java/org/apache/fop/fo/flow/table/EffRow.java index 17ab67f98..03012aa3c 100644 --- a/src/java/org/apache/fop/fo/flow/table/EffRow.java +++ b/src/java/org/apache/fop/fo/flow/table/EffRow.java @@ -80,13 +80,20 @@ public class EffRow { return getGridUnit(0).getRow(); } - /** @return the calculated height for this EffRow. */ + /** + * Returns the calculated height for this EffRow, including the cells' + * bpds/paddings/borders, and the table's border-separation. + * + * @return the row's height + */ public MinOptMax getHeight() { return this.height; } /** - * Sets the calculated height for this EffRow. + * Sets the calculated height for this EffRow, including everything (cells' bpds, + * paddings, borders, and border-separation). + * * @param mom the calculated height */ public void setHeight(MinOptMax mom) { diff --git a/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java b/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java index 2f2cd940e..ae8db7ba7 100644 --- a/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java +++ b/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java @@ -24,6 +24,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.fop.layoutmgr.ElementListUtils; import org.apache.fop.layoutmgr.table.TableCellLayoutManager; /** @@ -142,13 +143,11 @@ public class PrimaryGridUnit extends GridUnit { return getHalfMaxBeforeBorderWidth() + getHalfMaxAfterBorderWidth(); } - /** @param value The length of the cell content to remember. */ - public void setContentLength(int value) { - this.contentLength = value; - } - /** @return the length of the cell content. */ public int getContentLength() { + if (contentLength < 0) { + contentLength = ElementListUtils.calcContentLength(elements); + } return contentLength; } |