diff options
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Table.java | 4 | ||||
| -rwxr-xr-x | src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index b97bd6713..47047d41f 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -129,11 +129,11 @@ public class Table extends TableFObj { colPList.setWritingMode(); defaultColumn.bind(colPList); - if (borderCollapse != EN_SEPARATE && commonBorderPaddingBackground.hasPaddingInfo()) { + /*if (borderCollapse != EN_SEPARATE && commonBorderPaddingBackground.hasPadding()) { //See "17.6.2 The collapsing border model" in CSS2 getLogger().warn("Table may not have padding when using the collapsing " + "border model. Padding will be ignored."); - } + }*/ if (borderCollapse != EN_SEPARATE) { getLogger().warn("The collapsing border model on an fo:table " + "is currently not supported by FOP"); diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java index 931b881fd..4a92280ff 100755 --- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java +++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java @@ -371,10 +371,4 @@ public class CommonBorderPaddingBackground implements Cloneable { return (borderInfo[BEFORE] != null || borderInfo[AFTER] != null || borderInfo[START] != null || borderInfo[END] != null); } - - /** @return true if there is any padding (no evaluation) */ - public boolean hasPaddingInfo() { - return (padding[BEFORE] != null || padding[AFTER] != null - || padding[START] != null || padding[END] != null); - } } |