aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKeiron Liddle <keiron@apache.org>2001-10-05 10:29:48 +0000
committerKeiron Liddle <keiron@apache.org>2001-10-05 10:29:48 +0000
commitac81710cd4d56095517c98b48a4ef091418d850a (patch)
tree706ea70b5f3430337a5e779369ff26a3efbbe068 /src
parente4e3f3d6366ce6924d9f560f0bd8152bbb601a14 (diff)
downloadxmlgraphics-fop-ac81710cd4d56095517c98b48a4ef091418d850a.tar.gz
xmlgraphics-fop-ac81710cd4d56095517c98b48a4ef091418d850a.zip
fixed a couple of occasional problems with svg + batik
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194491 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/org/apache/fop/svg/SVGElement.java6
-rw-r--r--src/org/apache/fop/svg/SVGElementMapping.java8
2 files changed, 14 insertions, 0 deletions
diff --git a/src/org/apache/fop/svg/SVGElement.java b/src/org/apache/fop/svg/SVGElement.java
index 65ba2effe..9ec955f22 100644
--- a/src/org/apache/fop/svg/SVGElement.java
+++ b/src/org/apache/fop/svg/SVGElement.java
@@ -17,6 +17,7 @@ import org.apache.fop.layout.inline.*;
import org.apache.fop.configuration.Configuration;
import org.apache.batik.dom.svg.*;
+import org.apache.batik.dom.util.XMLSupport;
import org.w3c.dom.*;
import org.w3c.dom.svg.*;
import org.w3c.dom.svg.SVGLength;
@@ -146,6 +147,11 @@ public class SVGElement extends SVGObj {
}
Element e = ((SVGDocument)doc).getRootElement();
+
+ //if(!e.hasAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns")) {
+ e.setAttributeNS(XMLSupport.XMLNS_NAMESPACE_URI, "xmlns", SVGDOMImplementation.SVG_NAMESPACE_URI);
+ //}
+
String s;
SVGUserAgent userAgent = new SVGUserAgent(new AffineTransform());
userAgent.setLogger(log);
diff --git a/src/org/apache/fop/svg/SVGElementMapping.java b/src/org/apache/fop/svg/SVGElementMapping.java
index 548693967..012cd9b89 100644
--- a/src/org/apache/fop/svg/SVGElementMapping.java
+++ b/src/org/apache/fop/svg/SVGElementMapping.java
@@ -14,6 +14,9 @@ import org.apache.fop.fo.DirectPropertyListBuilder;
import org.apache.fop.fo.TreeBuilder;
import org.apache.fop.fo.FOTreeBuilder;
import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.apps.Driver;
+
+import org.apache.batik.util.XMLResourceDescriptor;
public class SVGElementMapping implements ElementMapping {
@@ -22,6 +25,11 @@ public class SVGElementMapping implements ElementMapping {
public synchronized void addToBuilder(TreeBuilder builder) {
if(foObjs == null) {
+ // this sets the parser that will be used
+ // by default (SVGBrokenLinkProvider)
+ // normally the user agent value is used
+ XMLResourceDescriptor.setXMLParserClassName(Driver.getParserClassName());
+
foObjs = new HashMap();
foObjs.put("svg", SVGElement.maker());
foObjs.put("rect", SVGObj.maker("rect"));