places svg inline

first part in moving towards proper inline areas


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

2 files changed, 23 insertions, 8 deletions

diff --git a/src/org/apache/fop/layout/inline/ForeignObjectArea.java b/src/org/apache/fop/layout/inline/ForeignObjectArea.java
index 2939b9955..7b698814f 100644
--- a/src/org/apache/fop/layout/inline/ForeignObjectArea.java
+++ b/src/org/apache/fop/layout/inline/ForeignObjectArea.java
@@ -58,8 +58,8 @@ import org.apache.fop.layout.*;
 import java.util.Vector;
 import java.util.Enumeration;
 
-public class ForeignObjectArea extends Area {
-	
+public class ForeignObjectArea extends InlineArea {
+
     protected int xOffset = 0;
     /* text-align of contents */
     protected int align;
@@ -78,17 +78,14 @@ public class ForeignObjectArea extends Area {
     protected int aheight;
     /* width */
     protected int width;
-    /* height */
-    protected int height;
     boolean wauto;
     boolean hauto;
     boolean cwauto;
     boolean chauto;
     int overflow;
 
-    public ForeignObjectArea(FontState fontState, int width,
-		     int height) {
-	super(fontState, width, height);
+    public ForeignObjectArea(FontState fontState, int width) {
+	    super(fontState, width, 0, 0, 0);
     }
 
     public void render(Renderer renderer) {
@@ -96,6 +93,24 @@ public class ForeignObjectArea extends Area {
 		renderer.renderForeignObjectArea(this);
     }
 
+    /**
+     * This is NOT the content width of the instream-foreign-object.
+     * This is the content width for a Box.
+     */
+    public int getContentWidth()
+    {
+        return getEffectiveWidth();
+    }
+
+    /**
+     * This is NOT the content height of the instream-foreign-object.
+     * This is the content height for a Box.
+     */
+    public int getHeight()
+    {
+        return getEffectiveHeight();
+    }
+
     public int getXOffset()
     {
         return this.xOffset;
diff --git a/src/org/apache/fop/layout/inline/InlineArea.java b/src/org/apache/fop/layout/inline/InlineArea.java
index be929ea80..5193b9752 100644
--- a/src/org/apache/fop/layout/inline/InlineArea.java
+++ b/src/org/apache/fop/layout/inline/InlineArea.java
@@ -58,7 +58,7 @@ import org.apache.fop.layout.*;
 public abstract class InlineArea extends Area {
 
     private int yOffset = 0;
-    private int height = 0;
+    protected int height = 0;
     private int verticalAlign = 0;
     protected String pageNumberId = null;
     private float red, green, blue;