From 11b69146c1ece368fac820bcb406557519cb12ab Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Fri, 16 Jul 2010 16:01:13 +0000 Subject: [PATCH] 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 --- .../poi/extractor/ExtractorFactory.java | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java index 2601f77aea..7ccb9f9297 100644 --- a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java +++ b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java @@ -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()+")"); }