diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-06-26 16:47:55 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-06-26 16:47:55 +0000 |
| commit | fa0e66e7a70e9d6f585c2c9b26024621366e8cd3 (patch) | |
| tree | ca86fe6b290dc5afc0b3a9cdc2a4e072876e6cbd | |
| parent | ec596ac5073680fe2d9727a9b297fbc4bdca4987 (diff) | |
| download | xmlgraphics-fop-fa0e66e7a70e9d6f585c2c9b26024621366e8cd3.tar.gz xmlgraphics-fop-fa0e66e7a70e9d6f585c2c9b26024621366e8cd3.zip | |
Revert revsision 201627.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@201873 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | src/java/org/apache/fop/fo/FObj.java | 15 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Block.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/BlockContainer.java | 2 |
3 files changed, 0 insertions, 19 deletions
diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 67059f481..827ebda3f 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -147,21 +147,6 @@ public abstract class FObj extends FONode implements Constants { } } - /** - * Checks the block-level FO for correct use of the span attribute. - * Used by fo:block and fo:block-container. - * @param pList the property list to determine if the span is explicit - */ - protected void checkSpanProperty(PropertyList pList) { - if (pList.getExplicit(PR_SPAN) != null) { - if (!(getParent() instanceof Flow)) { - attributeWarning("Ignoring span attribute on " + getName() - + " as it's not a direct child of an fo:flow." - + " (see XSL 1.0, 7.20.4)"); - } - } - } - /** * Returns Out Of Line FO Descendant indicator. * @return true if Out of Line FO or Out Of Line descendant, false otherwise diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index 3f638ae19..50f04a28e 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -160,8 +160,6 @@ public class Block extends FObjMixed { whiteSpaceCollapse = pList.get(PR_WHITE_SPACE_COLLAPSE).getEnum(); widows = pList.get(PR_WIDOWS).getNumeric(); wrapOption = pList.get(PR_WRAP_OPTION).getEnum(); - - checkSpanProperty(pList); } /** diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index 0a75bfc29..87892c91a 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java @@ -96,8 +96,6 @@ public class BlockContainer extends FObj { width = pList.get(PR_WIDTH).getLength(); writingMode = pList.get(PR_WRITING_MODE).getEnum(); zIndex = pList.get(PR_Z_INDEX).getNumeric(); - - checkSpanProperty(pList); } /** |