diff options
| author | Maxim Valyanskiy <maxcom@apache.org> | 2010-01-12 11:53:35 +0000 |
|---|---|---|
| committer | Maxim Valyanskiy <maxcom@apache.org> | 2010-01-12 11:53:35 +0000 |
| commit | ababd504b546f114169b8ffde7a18632fc1a816c (patch) | |
| tree | a6f79d2eb434690b77b3121f5e70f2457afe7d9d /src | |
| parent | 63387c5c31955bc7e20d934d70194b589f691a50 (diff) | |
| download | poi-ababd504b546f114169b8ffde7a18632fc1a816c.tar.gz poi-ababd504b546f114169b8ffde7a18632fc1a816c.zip | |
add more powerpoint xml mime types
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@898292 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
| -rw-r--r-- | src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java | 16 | ||||
| -rw-r--r-- | src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java | 5 |
2 files changed, 21 insertions, 0 deletions
diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java index 203c596574..24a2632be6 100644 --- a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java +++ b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java @@ -119,6 +119,22 @@ public class ExtractorFactory { if(corePart.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE)) { return new XSLFPowerPointExtractor(pkg); } + if(corePart.getContentType().equals(XSLFSlideShow.MACRO_CONTENT_TYPE)) { + return new XSLFPowerPointExtractor(pkg); + } + if(corePart.getContentType().equals(XSLFSlideShow.MACRO_TEMPLATE_CONTENT_TYPE)) { + return new XSLFPowerPointExtractor(pkg); + } + if(corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_CONTENT_TYPE)) { + return new XSLFPowerPointExtractor(pkg); + } + if(corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_TEMPLATE_CONTENT_TYPE)) { + return new XSLFPowerPointExtractor(pkg); + } + if(corePart.getContentType().equals(XSLFSlideShow.PRESENTATION_MACRO_CONTENT_TYPE)) { + return new XSLFPowerPointExtractor(pkg); + } + throw new IllegalArgumentException("No supported documents found in the OOXML package (found "+corePart.getContentType()+")"); } diff --git a/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java b/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java index be8615cd9b..c6a9a52cee 100644 --- a/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java +++ b/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java @@ -57,6 +57,11 @@ import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument; */ public class XSLFSlideShow extends POIXMLDocument { public static final String MAIN_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml"; + public static final String MACRO_CONTENT_TYPE = "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml"; + public static final String MACRO_TEMPLATE_CONTENT_TYPE = "application/vnd.ms-powerpoint.template.macroEnabled.main+xml"; + public static final String PRESENTATIONML_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml"; + public static final String PRESENTATIONML_TEMPLATE_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml"; + public static final String PRESENTATION_MACRO_CONTENT_TYPE = "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml"; public static final String NOTES_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml"; public static final String SLIDE_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.slide+xml"; public static final String SLIDE_LAYOUT_RELATION_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout"; |