xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r730764 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/fo/FObj.java src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java status.xml test/layoutengine/disabled-testcases.xml
Date Fri, 02 Jan 2009 16:08:24 GMT
Author: jeremias
Date: Fri Jan  2 08:08:24 2009
New Revision: 730764

URL: http://svn.apache.org/viewvc?rev=730764&view=rev
Log:
Bugzilla #45306:
Fixed fo:instream-foreign-object inside fo:marker.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
    xmlgraphics/fop/trunk/status.xml
    xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java?rev=730764&r1=730763&r2=730764&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FObj.java Fri Jan  2 08:08:24 2009
@@ -215,7 +215,7 @@
      * @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 @@
         }
     }
 
-    /** @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

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java?rev=730764&r1=730763&r2=730764&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/AbstractRetrieveMarker.java Fri
Jan  2 08:08:24 2009
@@ -30,8 +30,8 @@
 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 @@
                         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 @@
             } 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

Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=730764&r1=730763&r2=730764&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri Jan  2 08:08:24 2009
@@ -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>

Modified: xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml?rev=730764&r1=730763&r2=730764&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/trunk/test/layoutengine/disabled-testcases.xml Fri Jan  2 08:08:24 2009
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message