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

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);