Default 10pt font fallback removed.

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

diff --git a/src/java/org/apache/fop/afp/svg/AFPTextPainter.java b/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
index 2d68616a365cb1c7b61fd780f69abfff9dde2c4b..a5758732a608cb8fc192642a8acd148beaa12ac1 100644 (file)
--- a/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
+++ b/src/java/org/apache/fop/afp/svg/AFPTextPainter.java
@@ -115,8 +115,8 @@ public class AFPTextPainter implements TextPainter {
     private boolean hasUnsupportedAttributes(AttributedCharacterIterator aci) {
         boolean hasUnsupported = false;
 
+        Font font = getFont(aci);
         String text = getText(aci);
-        Font font = makeFont(aci);
         if (hasUnsupportedGlyphs(text, font)) {
             log.trace("-> Unsupported glyphs found");
             hasUnsupported = true;
@@ -228,8 +228,10 @@ public class AFPTextPainter implements TextPainter {
         loc = at.transform(loc, null);
 
         // font
-        Font font = makeFont(aci);
-        nativeTextHandler.setOverrideFont(font);
+        Font font = getFont(aci);
+        if (font != null) {
+            nativeTextHandler.setOverrideFont(font);
+        }
 
         // color
         TextPaintInfo tpi = (TextPaintInfo) aci.getAttribute(
@@ -333,11 +335,8 @@ public class AFPTextPainter implements TextPainter {
                        : Font.WEIGHT_NORMAL;
     }
 
-    private Font makeFont(AttributedCharacterIterator aci) {
+    private Font getFont(AttributedCharacterIterator aci) {
         Float fontSize = (Float)aci.getAttribute(TextAttribute.SIZE);
-        if (fontSize == null) {
-            fontSize = new Float(10.0f);
-        }
         String style = getStyle(aci);
         int weight = getWeight(aci);