diff options
| author | Glenn Adams <gadams@apache.org> | 2012-04-03 16:33:30 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-04-03 16:33:30 +0000 |
| commit | c3ad778fa810332a2f24ce9328c142fb654ae8a6 (patch) | |
| tree | 79f10c5df3d019f31c46ce4fd5e68143f6d3b088 /src/java/org/apache/fop | |
| parent | cfa6575b02cdc2f0c22e6999f809718be1672b11 (diff) | |
| download | xmlgraphics-fop-c3ad778fa810332a2f24ce9328c142fb654ae8a6.tar.gz xmlgraphics-fop-c3ad778fa810332a2f24ce9328c142fb654ae8a6.zip | |
Bugzilla #53005: Fix incorrect treatment of fo:wrapper as %block in fo:footnote
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1309024 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop')
| -rw-r--r-- | src/java/org/apache/fop/fo/FObj.java | 2 | ||||
| -rw-r--r-- | src/java/org/apache/fop/fo/flow/Inline.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index f1d78acf1..241a442ab 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -501,7 +501,7 @@ public abstract class FObj extends FONode implements Constants { * @param lName local name (i.e., no prefix) of incoming node * @return true if a member, false if not */ - boolean isNeutralItem(String nsURI, String lName) { + protected boolean isNeutralItem(String nsURI, String lName) { return (FO_URI.equals(nsURI) && ("multi-switch".equals(lName) || "multi-properties".equals(lName) diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index debf6bbf6..3a9583580 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -116,7 +116,8 @@ public class Inline extends InlineLevel { } } else if (!isBlockOrInlineItem(nsURI, localName)) { invalidChildError(loc, nsURI, localName); - } else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName)) { + } else if (!canHaveBlockLevelChildren && isBlockItem(nsURI, localName) + && !isNeutralItem(nsURI, localName)) { invalidChildError(loc, getParent().getName(), nsURI, getName(), "rule.inlineContent"); } else { |