Changeset 1464

Timestamp:

04/03/11 07:41:32 (14 months ago)

Author:

jharrop

Message:

Added VML part.

Location:

trunk/docx4j/src/main/java/org/docx4j

Files:

• jaxb/Context.java (modified) (1 diff)
• openpackaging/contenttype/ContentTypeManager.java (modified) (3 diffs)
• openpackaging/contenttype/ContentTypes.java (modified) (1 diff)
• openpackaging/parts/VMLPart.java (added)
• openpackaging/parts/relationships/Namespaces.java (modified) (1 diff)

trunk/docx4j/src/main/java/org/docx4j/jaxb/Context.java

@@ -75 +75 @@
                                         "org.docx4j.dml:org.docx4j.dml.chart:org.docx4j.dml.chartDrawing:org.docx4j.dml.compatibility:org.docx4j.dml.diagram:org.docx4j.dml.lockedCanvas:org.docx4j.dml.picture:org.docx4j.dml.wordprocessingDrawing:org.docx4j.dml.spreadsheetdrawing:" +
                                         // All VML stuff is here, since compiling it requires WML and DML (and MathML), but not PML or SML
-                                        "org.docx4j.vml:org.docx4j.vml.officedrawing:org.docx4j.vml.wordprocessingDrawing:org.docx4j.vml.presentationDrawing:org.docx4j.vml.spreadsheetDrawing:org.docx4j.vml.root" +
+                                        "org.docx4j.vml:org.docx4j.vml.officedrawing:org.docx4j.vml.wordprocessingDrawing:org.docx4j.vml.presentationDrawing:org.docx4j.vml.spreadsheetDrawing:org.docx4j.vml.root:" +
                                         "org.opendope.xpaths:org.opendope.conditions:org.opendope.questions:org.opendope.components:" +
                                         "org.docx4j.math",classLoader );

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java

@@ -83 +83 @@
 import org.docx4j.openpackaging.parts.PartName;
 import org.docx4j.openpackaging.parts.ThemePart;
+import org.docx4j.openpackaging.parts.VMLPart;
 import org.docx4j.openpackaging.parts.DrawingML.Chart;
 import org.docx4j.openpackaging.parts.DrawingML.Drawing;
@@ -386 +387 @@
                 } else if (contentType.equals(ContentTypes.IMAGE_WMF)) {
                         return new MetafileWmfPart(new PartName(partName));
+                } else if (contentType.equals(ContentTypes.VML_DRAWING)) {
+                        return new VMLPart(new PartName(partName));
                 } else if (contentType.startsWith("application/vnd.openxmlformats-officedocument.drawing")) {
                         return JaxbDmlPart.newPartForContentType(contentType, partName);
@@ -392 +395 @@
                 } else if (contentType.startsWith("application/vnd.openxmlformats-officedocument.spreadsheetml")) {
                         return JaxbSmlPart.newPartForContentType(contentType, partName);
-                }  if (contentType.equals(ContentTypes.APPLICATION_XML)
+                } else if (contentType.equals(ContentTypes.APPLICATION_XML)
                                 || partName.endsWith(".xml")) {
                         // Simple minded detection of XML content.

trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypes.java

@@ -271 +271 @@
                 "application/vnd.openxmlformats-officedocument.drawing+xml";
 
+        public final static String VML_DRAWING =
+                "application/vnd.openxmlformats-officedocument.vmlDrawing";
         
         

trunk/docx4j/src/main/java/org/docx4j/openpackaging/parts/relationships/Namespaces.java

@@ -271 +271 @@
         public final static String EMBEDDED_PKG = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
         
+        public final static String VML =  "http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing";
 }