litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Experimental support for embedded SVG in HTML5

Browse source 
git-svn-id: svn://svn.code.sf.net/p/writer2latex/code/trunk@147 f0f2a975-2e09-46c8-9428-3b39399b9f3c
This commit is contained in:
henrikjust 2012-04-04 09:35:48 +00:00
parent 71bff7e653
commit ac7f03f44f
3 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
View file

@ -185,7 +185,7 @@ public class GraphicConverterImpl2 implements GraphicConverter {
XStorable.class, xDocument); XStorable.class, xDocument);
xStore.storeToURL ("private:stream", exportProps); xStore.storeToURL ("private:stream", exportProps);
outputStream.closeOutput(); outputStream.closeOutput();
byte[] result = outputStream.getBuffer(); byte[] result = outputStream.getBuffer();
xDocument.dispose(); xDocument.dispose();

12
source/java/writer2latex/util/SimpleXMLParser.java
View file

@ -28,6 +28,7 @@ package writer2latex.util;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.StringReader;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
@ -35,6 +36,7 @@ import javax.xml.parsers.SAXParserFactory;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
@ -53,6 +55,8 @@ public class SimpleXMLParser extends DefaultHandler {
*/ */
public static Document parse(InputStream is) throws IOException, SAXException { public static Document parse(InputStream is) throws IOException, SAXException {
SAXParserFactory factory=SAXParserFactory.newInstance(); SAXParserFactory factory=SAXParserFactory.newInstance();
factory.setValidating(false);
SimpleXMLParser handler = new SimpleXMLParser(); SimpleXMLParser handler = new SimpleXMLParser();
try { try {
SAXParser saxParser = factory.newSAXParser(); SAXParser saxParser = factory.newSAXParser();
@ -71,7 +75,13 @@ public class SimpleXMLParser extends DefaultHandler {
public org.w3c.dom.Document getDOM() { public org.w3c.dom.Document getDOM() {
return builder.getDOM(); return builder.getDOM();
} }
// We don't need - and in fact should avoid - any external entities
@Override public InputSource resolveEntity(String publicID, String systemID) throws SAXException {
System.out.println("resolveEntity "+publicID+" "+systemID);
return new InputSource(new StringReader(""));
}
@Override public void startElement(String nameSpace, String localName, String qName, Attributes attributes){ @Override public void startElement(String nameSpace, String localName, String qName, Attributes attributes){
builder.startElement(qName); builder.startElement(qName);
int nLen = attributes.getLength(); int nLen = attributes.getLength();

32
source/java/writer2latex/xhtml/DrawConverter.java
View file

@ -491,12 +491,20 @@ public class DrawConverter extends ConverterHelper {
byte[] blob = bgd.getData(); byte[] blob = bgd.getData();
try { try {
Document dom = SimpleXMLParser.parse(new ByteArrayInputStream(blob)); Document dom = SimpleXMLParser.parse(new ByteArrayInputStream(blob));
Element elm = hnodeInline!=null ? hnodeInline : hnodeBlock; if (dom!=null) {
imageElement = (Element) elm.getOwnerDocument().importNode(dom.getDocumentElement(), true); Element elm = hnodeInline!=null ? hnodeInline : hnodeBlock;
imageElement = (Element) elm.getOwnerDocument().importNode(dom.getDocumentElement(), true);
}
else {
System.out.println("Failed to parse SVG");
}
} catch (IOException e) { } catch (IOException e) {
// Will not happen with a byte array // Will not happen with a byte array
System.out.println("IOException parsing SVG");
e.printStackTrace();
} catch (SAXException e) { } catch (SAXException e) {
e.printStackTrace(); e.printStackTrace();
System.out.println("SAXException parsing SVG");
} }
} }
else { else {
@ -517,17 +525,19 @@ public class DrawConverter extends ConverterHelper {
imageElement = image; imageElement = image;
} }
// Now style it if (imageElement!=null) {
StyleInfo info = new StyleInfo(); // Now style it
String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME); StyleInfo info = new StyleInfo();
if (nMode!=FULL_SCREEN) { getFrameSc().applyStyle(sStyleName,info); } String sStyleName = Misc.getAttribute(frame, XMLString.DRAW_STYLE_NAME);
applyImageSize(frame,info.props,nMode,false); if (nMode!=FULL_SCREEN) { getFrameSc().applyStyle(sStyleName,info); }
applyImageSize(frame,info.props,nMode,false);
// Apply placement // Apply placement
applyPlacement(frame, hnodeBlock, hnodeInline, nMode, imageElement, info); applyPlacement(frame, hnodeBlock, hnodeInline, nMode, imageElement, info);
applyStyle(info,imageElement); applyStyle(info,imageElement);
addLink(onode,imageElement); addLink(onode,imageElement);
}
} }
private void handleDrawTextBox(Element onode, Element hnodeBlock, Element hnodeInline, int nMode) { private void handleDrawTextBox(Element onode, Element hnodeBlock, Element hnodeInline, int nMode) {