a simple impl of getting ipd and line height

some adjustments to user agent


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

1 files changed, 3 insertions, 7 deletions

diff --git a/src/org/apache/fop/fo/FObjMixed.java b/src/org/apache/fop/fo/FObjMixed.java
index d525fb243..ac1489b8f 100644
--- a/src/org/apache/fop/fo/FObjMixed.java
+++ b/src/org/apache/fop/fo/FObjMixed.java
@@ -20,7 +20,7 @@ import org.apache.fop.datatypes.ColorType;
  * and their processing
  */
 public class FObjMixed extends FObj {
-    FOText.TextInfo textInfo = null;
+    TextInfo textInfo = null;
     FontInfo fontInfo=null;
 
     public FObjMixed(FONode parent) {
@@ -33,7 +33,7 @@ public class FObjMixed extends FObj {
 
     protected void addCharacters(char data[], int start, int length) {
         if(textInfo == null) {
-	    textInfo = new FOText.TextInfo();
+	    textInfo = new TextInfo();
 
 	    try {
 		textInfo.fs = propMgr.getFontState(fontInfo);
@@ -43,9 +43,7 @@ public class FObjMixed extends FObj {
 	    }
 
             ColorType c = getProperty("color").getColorType();
-            textInfo.red = c.red();
-            textInfo.green = c.green();
-            textInfo.blue = c.blue();
+            textInfo.color = c;
 
             textInfo.verticalAlign =
                 getProperty("vertical-align").getEnum();
@@ -98,7 +96,5 @@ public class FObjMixed extends FObj {
 	return new RecursiveCharIterator(this);
     }
 
-
-
 }