changed pixel to mm to longer name

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

diff --git a/src/org/apache/fop/fo/FOUserAgent.java b/src/org/apache/fop/fo/FOUserAgent.java
index e5823180f7fd881e42b37ca6143edcbba098143f..543b461915e71b2b68081fb5092f372e04dd7fce 100644 (file)
--- a/src/org/apache/fop/fo/FOUserAgent.java
+++ b/src/org/apache/fop/fo/FOUserAgent.java
@@ -54,7 +54,7 @@ public class FOUserAgent implements LogEnabled {
         return base;
     }
 
-    public float getPixelToMM() {
+    public float getPixelUnitToMillimeter() {
         return 0.35277777777777777778f;
     }
 

diff --git a/src/org/apache/fop/svg/SVGElement.java b/src/org/apache/fop/svg/SVGElement.java
index e505fbab382fec48ef80efa0a7b7e6d779fa9835..e19b6db9da2c64b07ea83e581f8ce6de56c625a7 100644 (file)
--- a/src/org/apache/fop/svg/SVGElement.java
+++ b/src/org/apache/fop/svg/SVGElement.java
@@ -80,7 +80,7 @@ public class SVGElement extends SVGObj {
         }
 
         Element e = ((SVGDocument)doc).getRootElement();
-        final float ptmm = userAgent.getPixelToMM();
+        final float ptmm = userAgent.getPixelUnitToMillimeter();
         SVGContext dc = new SVGContext() {
             public float getPixelToMM() {
                 return ptmm;
@@ -118,8 +118,8 @@ public class SVGElement extends SVGObj {
         //if(!e.hasAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns")) {
             e.setAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns", SVGDOMImplementation.SVG_NAMESPACE_URI);
         //}
-
-        Point2D p2d = getSize(12 /* font size */, svgRoot, userAgent.getPixelToMM());
+        int fontSize = 12;
+        Point2D p2d = getSize(fontSize, svgRoot, userAgent.getPixelUnitToMillimeter());
        ((SVGOMElement)e).setSVGContext(null);
 
         return p2d;

diff --git a/src/org/apache/fop/svg/SVGUserAgent.java b/src/org/apache/fop/svg/SVGUserAgent.java
index f855338d44c4bd5d51bafe17f956a1ecadf05f9b..a3b4585888f42242c43ff3bdfddca81ca76748f6 100644 (file)
--- a/src/org/apache/fop/svg/SVGUserAgent.java
+++ b/src/org/apache/fop/svg/SVGUserAgent.java
@@ -80,7 +80,7 @@ public class SVGUserAgent extends UserAgentAdapter {
      * Returns a customized the pixel to mm factor.
      */
     public float getPixelUnitToMillimter() {
-        return userAgent.getPixelToMM();
+        return userAgent.getPixelUnitToMillimeter();
     }
 
     /**