diff options
| author | Vincent Hennebert <vhennebert@apache.org> | 2007-04-20 19:09:51 +0000 |
|---|---|---|
| committer | Vincent Hennebert <vhennebert@apache.org> | 2007-04-20 19:09:51 +0000 |
| commit | 9590ee0eb04c2eb13e06c175caeb8108cc5d406c (patch) | |
| tree | 91a642fd4dd7693e5fdcbfef2ad938d634b8d1a4 /src/java/org/apache/fop/layoutmgr/table | |
| parent | 0dee60e68eb42e626fe4dddf5ba653d313535d36 (diff) | |
| download | xmlgraphics-fop-9590ee0eb04c2eb13e06c175caeb8108cc5d406c.tar.gz xmlgraphics-fop-9590ee0eb04c2eb13e06c175caeb8108cc5d406c.zip | |
Fix the handling of padding for spanning cells in the collapsing-border model
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@530887 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr/table')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java index 5f3c60aea..1ea836d38 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java @@ -358,8 +358,6 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager primaryGridUnit.getFlag(GridUnit.IN_LAST_COLUMN)}; TraitSetter.addCollapsingBorders(curBlockArea, primaryGridUnit.getBorders(), outer, this); - TraitSetter.addPadding(curBlockArea, primaryGridUnit.getBorders(), - false, false, false, false, this); } else { boolean[] outer = new boolean[4]; int dy = yoffset; @@ -405,6 +403,8 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager } } } + TraitSetter.addPadding(curBlockArea, primaryGridUnit.getBorders(), + false, false, false, false, this); //Handle display-align int contentBPD = getContentHeight(primaryGridUnit); |