diff options
| -rw-r--r-- | src/org/apache/fop/layoutmgr/table/Cell.java | 12 | ||||
| -rw-r--r-- | src/org/apache/fop/layoutmgr/table/Row.java | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/org/apache/fop/layoutmgr/table/Cell.java b/src/org/apache/fop/layoutmgr/table/Cell.java index 6a51b56b5..c471a81a4 100644 --- a/src/org/apache/fop/layoutmgr/table/Cell.java +++ b/src/org/apache/fop/layoutmgr/table/Cell.java @@ -41,6 +41,7 @@ public class Cell extends BlockStackingLayoutManager { private int xoffset; private int yoffset; private int cellIPD; + private int height; /** * Create a new Cell layout manager. @@ -137,6 +138,15 @@ public class Cell extends BlockStackingLayoutManager { } /** + * Set the row height that contains this cell. + * + * @param h the height of the row + */ + public void setRowHeight(int h) { + height = h; + } + + /** * Add the areas for the break points. * The cell contains block stacking layout managers * that add block areas. @@ -171,6 +181,8 @@ public class Cell extends BlockStackingLayoutManager { addBackground(curBlockArea, backgroundProps); } + curBlockArea.setHeight(height); + flush(); childBreaks.clear(); diff --git a/src/org/apache/fop/layoutmgr/table/Row.java b/src/org/apache/fop/layoutmgr/table/Row.java index 3784bb984..dfedc6315 100644 --- a/src/org/apache/fop/layoutmgr/table/Row.java +++ b/src/org/apache/fop/layoutmgr/table/Row.java @@ -60,6 +60,11 @@ public class Row extends BlockStackingLayoutManager { super(fobj); } + /** + * Initialize properties for this layout manager. + * + * @param propMgr the property manager for the fo + */ protected void initProperties(PropertyManager propMgr) { borderProps = propMgr.getBorderAndPadding(); backgroundProps = propMgr.getBackgroundProps(); @@ -167,7 +172,7 @@ public class Row extends BlockStackingLayoutManager { if (stackSize.min > min) { min = stackSize.min; } - // the optimum is the minimum of all optimums + // the optimum is the maximum of all optimums if (stackSize.opt > opt) { opt = stackSize.opt; } @@ -238,6 +243,7 @@ public class Row extends BlockStackingLayoutManager { while ((childLM = (Cell)breakPosIter.getNextChildLM()) != null) { childLM.setXOffset(xoffset); childLM.setYOffset(yoffset); + childLM.setRowHeight(rowHeight); childLM.addAreas(breakPosIter, lc); } xoffset += col.getWidth(); |