Create a dummy PercentBaseContext in FOPRtfAttributes, so that

percentage font size properties are properly evaluated. Patch by
Renaud Michel <renaud dot michel at defimedia dot be>. Unfortunately,
no regression test, because I have no RTF test framework.

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

diff --git a/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java b/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
index 9c8fe1cf5f4b76f92bedd412d0642ae260317068..56644d1733964ed0ce6d7ac91a8f82dc9284eebd 100755 (executable)
--- a/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
+++ b/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java
@@ -21,6 +21,8 @@ package org.apache.fop.render.rtf;
 
 import java.awt.Color;
 import org.apache.fop.datatypes.Length;
+import org.apache.fop.datatypes.PercentBaseContext;
+import org.apache.fop.fo.FObj;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfAttributes;
 import org.apache.fop.render.rtf.rtflib.rtfdoc.RtfColorTable;
 
@@ -59,7 +61,8 @@ public class FOPRtfAttributes extends RtfAttributes {
      * @return this (which now contains the new entry)
      */
     public RtfAttributes setHalfPoints(String name, Length value) {
-        set(name, value.getValue() / (1000 / 2)); //Convert millipoints to half-points
+        //Convert millipoints to half-points
+        set(name, value.getValue(DummyPercentBaseContext.singleton) / (1000 / 2));
         return this;
     }
 
@@ -78,4 +81,18 @@ public class FOPRtfAttributes extends RtfAttributes {
                 redComponent, greenComponent, blueComponent).intValue());
         return this;
     }
+
+    private static class DummyPercentBaseContext implements PercentBaseContext {
+        
+        static DummyPercentBaseContext singleton = new DummyPercentBaseContext();
+        
+        private DummyPercentBaseContext() {
+            // noop
+        }
+        
+        public int getBaseLength(int lengthBase, FObj fobj) {
+            return 0;
+        }
+    }
+        
 }