Set the background traits after the BPD and IPD are set.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@264116 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 7 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index 2819383ae..a304a0dd4 100644
--- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -317,13 +317,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager implement
 
         getPSLM().addIDToPage(fobj.getId());
 
-        if (isSeparateBorderModel()) {
-            if (!emptyCell || fobj.showEmptyCells()) {
-                TraitSetter.addBorders(curBlockArea, fobj.getCommonBorderPaddingBackground());
-                TraitSetter.addBackground(curBlockArea, fobj.getCommonBorderPaddingBackground());
-            }
-        } else {
-            TraitSetter.addBackground(curBlockArea, fobj.getCommonBorderPaddingBackground());
+        if (!isSeparateBorderModel()) {
             boolean[] outer = new boolean[] {
                     gridUnit.getFlag(GridUnit.FIRST_IN_TABLE), 
                     gridUnit.getFlag(GridUnit.LAST_IN_TABLE),
@@ -402,6 +396,15 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager implement
         
         curBlockArea.setBPD(contentBPD);
 
+        if (isSeparateBorderModel()) {
+            if (!emptyCell || fobj.showEmptyCells()) {
+                TraitSetter.addBorders(curBlockArea, fobj.getCommonBorderPaddingBackground());
+                TraitSetter.addBackground(curBlockArea, fobj.getCommonBorderPaddingBackground());
+            }
+        } else {
+            TraitSetter.addBackground(curBlockArea, fobj.getCommonBorderPaddingBackground());
+        }
+        
         flush();
 
         curBlockArea = null;