From 9590ee0eb04c2eb13e06c175caeb8108cc5d406c Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Fri, 20 Apr 2007 19:09:51 +0000 Subject: [PATCH] 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 --- .../apache/fop/layoutmgr/table/TableCellLayoutManager.java | 4 ++-- 1 file 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); -- 2.39.5