aboutsummaryrefslogtreecommitdiffstats
path: root/src/java
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2005-07-18 10:51:00 +0000
committerJeremias Maerki <jeremias@apache.org>2005-07-18 10:51:00 +0000
commit2d5e70fa412d2a2a5d405d84a9239668a11aeda2 (patch)
tree16cb698689cc9aa7a858cf99d396bab0edaebb85 /src/java
parent625e3c3b10bf1b7e98b365565d5b702a7ce8f12b (diff)
downloadxmlgraphics-fop-2d5e70fa412d2a2a5d405d84a9239668a11aeda2.tar.gz
xmlgraphics-fop-2d5e70fa412d2a2a5d405d84a9239668a11aeda2.zip
No more warnings about unexpected FOText inside markers.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@219464 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java')
-rw-r--r--src/java/org/apache/fop/fo/FOText.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 393c20871..4014e2fb8 100644
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -31,6 +31,8 @@ import org.apache.fop.fo.properties.CommonHyphenation;
import org.apache.fop.fo.properties.CommonTextDecoration;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
+
+// SAX
import org.xml.sax.Locator;
/**
@@ -214,8 +216,11 @@ public class FOText extends FONode {
ancestorFONode = ancestorFONode.parent;
if (ancestorFONode instanceof org.apache.fop.fo.pagination.Title) {
return;
+ } else if (ancestorFONode instanceof org.apache.fop.fo.flow.Marker) {
+ return;
} else if (ancestorFONode instanceof Root) {
- getLogger().warn("Unexpected: fo:text with no fo:block ancestor");
+ getLogger().warn("Unexpected: fo:text with no fo:block ancestor. The text is: "
+ + new String(ca));
return;
} else if (ancestorFONode instanceof Block) {
this.ancestorBlock = (Block)ancestorFONode;