From f99c3b88a78d717ba835dd2ca8e8a9e8321c288b Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Thu, 19 Apr 2007 15:12:50 +0000 Subject: [PATCH] - remove call to addPadding in TraitSetter.addCollapsingBorders - make the call explicit in TableCellLM, only when necessary. That is, areas holding borders for spanning cells in collapsing mode don't need to have padding set git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@530445 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/layoutmgr/TraitSetter.java | 2 -- .../org/apache/fop/layoutmgr/table/TableCellLayoutManager.java | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java index 274204122..b50167b16 100644 --- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java +++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java @@ -208,8 +208,6 @@ public class TraitSetter { if (bps != null) { area.addTrait(Trait.BORDER_END, bps); } - - addPadding(area, bordProps, context); } private static void addPadding(Area area, CommonBorderPaddingBackground bordProps, diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java index 2f17a6a25..fabc508b1 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java @@ -380,6 +380,8 @@ 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; -- 2.39.5