Changeset 1199 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java

Timestamp:

09/06/10 05:36:48 (21 months ago)

Author:

jharrop

Message:

Implementation of xlsx (ECMA 376 1st ed)

File:

• trunk/docx4j/src/main/java/org/docx4j/openpackaging/contenttype/ContentTypeManager.java (modified) (4 diffs)

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

@@ -69 +69 @@
 import org.docx4j.openpackaging.packages.OpcPackage;
 import org.docx4j.openpackaging.packages.PresentationMLPackage;
+import org.docx4j.openpackaging.packages.SpreadsheetMLPackage;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.docx4j.openpackaging.parts.CustomXmlDataStoragePropertiesPart;
@@ -79 +80 @@
 import org.docx4j.openpackaging.parts.ThemePart;
 import org.docx4j.openpackaging.parts.PresentationML.JaxbPmlPart;
+import org.docx4j.openpackaging.parts.SpreadsheetML.JaxbSmlPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.CommentsPart;
@@ -358 +360 @@
                         return new org.docx4j.openpackaging.parts.DrawingML.DiagramLayoutPart(new PartName(partName));
                 } else if (contentType.equals(ContentTypes.DRAWINGML_DIAGRAM_STYLE)) {
-                        return new org.docx4j.openpackaging.parts.DrawingML.DiagramStylePart(new PartName(partName));                   
-                } else if (contentType.equals(ContentTypes.APPLICATION_XML)
+                        return new org.docx4j.openpackaging.parts.DrawingML.DiagramStylePart(new PartName(partName));
+                } else if (contentType.startsWith("application/vnd.openxmlformats-officedocument.spreadsheetml")) {
+                        return JaxbSmlPart.newPartForContentType(contentType, partName);
+                        
+                }  if (contentType.equals(ContentTypes.APPLICATION_XML)
                                 || partName.endsWith(".xml")) {
                         // Simple minded detection of XML content.
@@ -720 +725 @@
                         p = new PresentationMLPackage(this);
                         return p;
-                        
+                } else if (getPartNameOverridenByContentType(ContentTypes.SPREADSHEETML_MAIN) != null) {
+                        log.info("Detected SpreadhseetMLPackage package ");
+                        p = new SpreadsheetMLPackage(this);
+                        return p;                       
                 } else {
                         throw new InvalidFormatException("Unexpected package (docx4j supports docx/docxm and pptx only");