Enable border and background for instream-foreign-object.

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

diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
index 02b73dd76937f4dfe3bf985b96b1802202e3a193..60c36f2715462c51d4f69d2e4e82169b896f0c4e 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
+++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
@@ -190,6 +190,13 @@ public class InstreamForeignObject extends FObj {
         return id;
     }
 
+    /**
+     * Return the Common Border, Padding, and Background Properties.
+     */
+    public CommonBorderPaddingBackground getCommonBorderPaddingBackground() {
+        return commonBorderPaddingBackground;
+    }
+
     /**
      * Return the "line-height" property.
      */

diff --git a/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java b/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
index 636acde536575a7f7c1101a4dc3d5a93ba860e21..15d87f84815d8ef3440d6bea6b2333d05bd90ba1 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
+++ b/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
@@ -30,9 +30,10 @@ import org.apache.fop.area.inline.ForeignObject;
 import org.apache.fop.area.inline.Viewport;
 
 /**
- * LayoutManager for the fo:basic-link formatting object
+ * LayoutManager for the fo:instream-foreign-object formatting object
  */
 public class InstreamForeignObjectLM extends LeafNodeLayoutManager {
+    
     private InstreamForeignObject fobj;
     
     /**
@@ -63,7 +64,7 @@ public class InstreamForeignObjectLM extends LeafNodeLayoutManager {
         //int h = this.propertyList.get("height").getLength().mvalue();
 
         // use specified line-height then ignore dimension in height direction
-        boolean hasLH = false;//propertyList.get("line-height").getSpecifiedValue() != null;
+        boolean hasLH = false; //propertyList.get("line-height").getSpecifiedValue() != null;
 
         Length len;
 
@@ -175,16 +176,23 @@ public class InstreamForeignObjectLM extends LeafNodeLayoutManager {
         fobj.childNodes = null;
         ForeignObject foreign = new ForeignObject(doc, ns);
 
-        Viewport areaCurrent = new Viewport(foreign);
-        areaCurrent.setIPD(ipd);
-        areaCurrent.setBPD(bpd);
-        areaCurrent.setContentPosition(placement);
-        areaCurrent.setClip(clip);
-        areaCurrent.setOffset(0);
+        Viewport vp = new Viewport(foreign);
+        vp.setIPD(ipd);
+        vp.setBPD(bpd);
+        vp.setContentPosition(placement);
+        vp.setClip(clip);
+        vp.setOffset(0);
+
+        // Common Border, Padding, and Background Properties
+        TraitSetter.addBorders(vp, fobj.getCommonBorderPaddingBackground());
+        TraitSetter.addBackground(vp, fobj.getCommonBorderPaddingBackground());
 
-        return areaCurrent;
+        return vp;
     }
     
+    /**
+     * @see org.apache.fop.layoutmgr.LeafNodeLayoutManager#addId()
+     */
     protected void addId() {
         addID(fobj.getId());
     }