Bugzilla #45306:

Fixed fo:instream-foreign-object inside fo:marker.

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

diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index e0624df6919faa1dfc69a8c2843951a48d1f9486..55844e6dbfb7a3c9ee80c43e041b427ff1a2eef4 100644 (file)
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -215,7 +215,7 @@ public abstract class FObj extends FONode implements Constants {
      * @param parent    the (cloned) parent node
      * @throws FOPException when the child could not be added to the parent
      */
-    protected static void addChildTo(FONode child, FObj parent)
+    protected static void addChildTo(FONode child, FONode parent)
                             throws FOPException {
         parent.addChildNode(child);
     }
@@ -573,11 +573,11 @@ public abstract class FObj extends FONode implements Constants {
         }
     }
 
-    /** @return true if this FObj has extension attachments */ 
+    /** @return true if this FObj has extension attachments */
     public boolean hasExtensionAttachments() {
         return extensionAttachments != null;
     }
-    
+
     /**
      * Adds a foreign attribute to this FObj.
      * @param attributeName the attribute name as a QName instance

diff --git a/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java b/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
index ebba1fda587d68fdc3d42eaf8c0535121efe77f0..1432c938118929787c62029b053d5c002056f5eb 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
@@ -30,8 +30,8 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.ValidationException;
+import org.apache.fop.fo.XMLObj;
 import org.apache.fop.fo.flow.table.Table;
-import org.apache.fop.fo.flow.table.TableFObj;
 
 /**
  * Abstract base class for the <a href="http://www.w3.org/TR/xsl/#fo_retrieve-marker">
@@ -102,7 +102,7 @@ public abstract class AbstractRetrieveMarker extends FObjMixed {
                         getLocator(),
                         pList,
                         newPropertyList);
-                addChildTo(newChild, (FObj) newParent);
+                addChildTo(newChild, newParent);
                 if (newChild.getNameId() == FO_TABLE) {
                     Table t = (Table) child;
                     cloneSubtree(t.getColumns().iterator(),
@@ -117,7 +117,9 @@ public abstract class AbstractRetrieveMarker extends FObjMixed {
             } else if (child instanceof FOText) {
                 FOText ft = (FOText) newChild;
                 ft.bind(parentPropertyList);
-                addChildTo(newChild, (FObj) newParent);
+                addChildTo(newChild, newParent);
+            } else if (child instanceof XMLObj) {
+                addChildTo(newChild, newParent);
             }
 
             // trigger end-of-node white-space handling

diff --git a/status.xml b/status.xml
index 6d9373a9f3fc2c57d2595edef8db25719f8f61c1..e6362fb7d2be373872e65335dad0d409add376a2 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -53,6 +53,9 @@
 
   <changes>
     <release version="FOP Trunk" date="TBD">
+      <action context="Layout" dev="JM" type="fix" fixes-bug="45306">
+        Fixed fo:instream-foreign-object inside fo:marker.
+      </action>
       <action context="Renderers" dev="JM" type="fix">
         Fixed black backgrounds occurring for transparent images in PCL output.
       </action>

diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index 7bf441d5b5fb48210e96dc12dfe1583a01a396ef..ca05b156b3d4e7d677f7165e2a7c08a4f8eb7187 100644 (file)
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -223,9 +223,4 @@
     relaxed validation must be switched on, otherwise there is a validation
     exception.</description>
   </testcase>
-  <testcase>
-    <name>Instream foreign objects in markers</name>
-    <file>marker_instream-foreign-object.xml</file>
-    <description>Foreign objects in markers do not work.</description>
-  </testcase>
 </disabled-testcases>