Merged trunk@1356765

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

1 files changed, 4 insertions, 6 deletions

diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
index 72cf19bc7..577efcdf4 100644
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
@@ -23,7 +23,7 @@ package org.apache.fop.fo.extensions.svg;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-import java.net.URL;
+import java.net.URI;
 
 import org.w3c.dom.Element;
 
@@ -71,12 +71,10 @@ public class SVGElement extends SVGObj {
         /* if width and height are zero, get the bounds of the content. */
 
         try {
-            URL baseURL = new URL(getUserAgent().getBaseURL() == null
-                            ? new java.io.File("").toURI().toURL().toExternalForm()
-                            : getUserAgent().getBaseURL());
-            if (baseURL != null) {
+            URI baseUri = getUserAgent().getResourceResolver().getBaseURI();
+            if (baseUri != null) {
                 SVGOMDocument svgdoc = (SVGOMDocument)doc;
-                svgdoc.setURLObject(baseURL);
+                svgdoc.setURLObject(baseUri.toURL());
                 //The following line should not be called to leave FOP compatible to Batik 1.6.
                 //svgdoc.setDocumentURI(baseURL.toString());
             }