You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2010/07/16 18:01:14 UTC
svn commit: r964844 -
/poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java
Author: nick
Date: Fri Jul 16 16:01:13 2010
New Revision: 964844
URL: http://svn.apache.org/viewvc?rev=964844&view=rev
Log:
Fix indent, and make the mime type matching more consistent
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.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=964844&r1=964843&r2=964844&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 Fri Jul 16 16:01:13 2010
@@ -181,24 +181,14 @@ public class ExtractorFactory {
return new XWPFWordExtractor(pkg);
}
- if(corePart.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE)) {
+ if(corePart.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE) ||
+ corePart.getContentType().equals(XSLFSlideShow.MACRO_CONTENT_TYPE) ||
+ corePart.getContentType().equals(XSLFSlideShow.MACRO_TEMPLATE_CONTENT_TYPE) ||
+ corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_CONTENT_TYPE) ||
+ corePart.getContentType().equals(XSLFSlideShow.PRESENTATIONML_TEMPLATE_CONTENT_TYPE) ||
+ corePart.getContentType().equals(XSLFSlideShow.PRESENTATION_MACRO_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()+")");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org