Here's why forcing to border-collapse="separate" on fo:table didn't work. D'oh!

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

diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java
index e11564a32e0f24b9a939cee4ded9f7e62a1bbc53..a3def066a111f71cba3020474e6799617415e725 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/TableCell.java
@@ -30,7 +30,6 @@ import org.apache.fop.fo.properties.CommonAccessibility;
 import org.apache.fop.fo.properties.CommonAural;
 import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
 import org.apache.fop.fo.properties.CommonRelativePosition;
-import org.apache.fop.fo.properties.LengthPairProperty;
 import org.apache.fop.fo.properties.LengthRangeProperty;
 
 /**
@@ -44,8 +43,6 @@ public class TableCell extends TableFObj {
     private CommonBorderPaddingBackground commonBorderPaddingBackground;
     private CommonRelativePosition commonRelativePosition;
     private LengthRangeProperty blockProgressionDimension;
-    private int borderCollapse; //inherited from fo:table
-    private LengthPairProperty borderSeparation; //inherited from fo:table
     private Numeric columnNumber;
     private int displayAlign;
     private int relativeAlign;
@@ -114,8 +111,6 @@ public class TableCell extends TableFObj {
         commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
         commonRelativePosition = pList.getRelativePositionProps();
         blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
-        borderCollapse = pList.get(PR_BORDER_COLLAPSE).getEnum();
-        borderSeparation = pList.get(PR_BORDER_SEPARATION).getLengthPair();
         columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric();
         displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
         relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
@@ -329,21 +324,6 @@ public class TableCell extends TableFObj {
         return (this.emptyCells == EN_SHOW);
     }
     
-    /** @return the "border-collapse" property (inherited from fo:table). */
-    public int getBorderCollapse() {
-        return borderCollapse;
-    }
-
-    /** @return true if the separate border model is active */
-    public boolean isSeparateBorderModel() {
-        return (getBorderCollapse() == EN_SEPARATE);
-    }
-    
-    /** @return the "border-separation" property (inherited from fo:table). */
-    public LengthPairProperty getBorderSeparation() {
-        return borderSeparation;
-    }
-
     /**
      * @return the "id" property.
      */

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index ce37bf06c07902950bffbf657337c6292bf53f16..8ec1b8e16c2c22484358fc208a57398918f340bc 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -81,7 +81,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager
     }
     
     private boolean isSeparateBorderModel() {
-        return getTableCell().isSeparateBorderModel();
+        return getTable().isSeparateBorderModel();
     }
     
     /** @see org.apache.fop.layoutmgr.LayoutManager#initialize() */
@@ -138,7 +138,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager
         cellIPD = referenceIPD;
         cellIPD -= getIPIndents();
         if (isSeparateBorderModel()) {
-            int borderSep = getTableCell().getBorderSeparation().getLengthPair()
+            int borderSep = getTable().getBorderSeparation().getLengthPair()
                     .getIPD().getLength().getValue(this);
             cellIPD -= borderSep;
         }