Changeset 1494 for trunk/docx4j/src/main/java/org/docx4j/openpackaging

Timestamp:

05/17/11 09:33:11 (12 months ago)

Author:

jharrop

Message:

Detect /xl/workbook.xml as WorkbookPart?, rather than DefaultXmlPart?.
Add convenience method getWorkbookPart

File:

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

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

@@ -89 +89 @@
 import org.docx4j.openpackaging.parts.PresentationML.JaxbPmlPart;
 import org.docx4j.openpackaging.parts.SpreadsheetML.JaxbSmlPart;
+import org.docx4j.openpackaging.parts.SpreadsheetML.WorkbookPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.AlternativeFormatInputPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
@@ -276 +277 @@
         public Part newPartForContentType(String contentType, String partName, Relationship rel)
                 throws InvalidFormatException, PartUnrecognisedException {
-                
+                                
                 // TODO - a number of WordML parts aren't listed here!
                 if (rel!=null && rel.getType().equals(Namespaces.AF) ) {
@@ -393 +394 @@
                 } else if (contentType.startsWith("application/vnd.openxmlformats-officedocument.presentationml")) {
                         return JaxbPmlPart.newPartForContentType(contentType, partName);
+                } else if (contentType.equals(ContentTypes.SPREADSHEETML_WORKBOOK)
+                                || contentType.equals(ContentTypes.SPREADSHEETML_WORKBOOK_MACROENABLED)
+                                || contentType.equals(ContentTypes.SPREADSHEETML_TEMPLATE)
+                                || contentType.equals(ContentTypes.SPREADSHEETML_TEMPLATE_MACROENABLED)) { 
+                        return new WorkbookPart(new PartName(partName));
                 } else if (contentType.startsWith("application/vnd.openxmlformats-officedocument.spreadsheetml")) {
                         return JaxbSmlPart.newPartForContentType(contentType, partName);