Author: maxcom
Date: Tue Jan 12 11:53:35 2010
New Revision: 898292
URL: http://svn.apache.org/viewvc?rev=898292&view=rev
Log:
add more powerpoint xml mime types
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java?rev=898292&r1=898291&r2=898292&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java Tue
Jan 12 11:53:35 2010
@@ -119,6 +119,22 @@
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()+")");
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java?rev=898292&r1=898291&r2=898292&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/XSLFSlideShow.java Tue Jan 12
11:53:35 2010
@@ -57,6 +57,11 @@
*/
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";;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
