- 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

diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
index 274204122826bc73558d696082454fa1e0271621..b50167b16c611268f7cec77619707661c2071ad3 100644 (file)
--- 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 2f17a6a258d98e31a70b254621d592b21f6950be..fabc508b114b8bfa43544a293b4f4f5b35ce3966 100644 (file)
--- 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;