svn commit: r530445 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr: TraitSetter.java table/TableCellLayoutManager.java

[vhennebert]

Author: vhennebert
Date: Thu Apr 19 08:12:50 2007
New Revision: 530445

URL: http://svn.apache.org/viewvc?view=rev&rev=530445
Log:
- 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

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
    
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java?view=diff&rev=530445&r1=530444&r2=530445
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java 
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java 
Thu Apr 19 08:12:50 2007
@@ -208,8 +208,6 @@
         if (bps != null) {
             area.addTrait(Trait.BORDER_END, bps);
         }
-
-        addPadding(area, bordProps, context);
     }
 
     private static void addPadding(Area area, CommonBorderPaddingBackground 
bordProps, 

Modified: 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?view=diff&rev=530445&r1=530444&r2=530445
==============================================================================
--- 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
 (original)
+++ 
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
 Thu Apr 19 08:12:50 2007
@@ -380,6 +380,8 @@
                         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;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]