Fix indent, and make the mime type matching more consistent

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@964844 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2010-07-16 16:01:13 +00:00
parent 6d93fb9d5d
commit 7483d655a6

View File

@ -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()+")");
}