From: Nick Burch <nick@apache.org>
Date: Fri, 16 Jul 2010 16:01:13 +0000 (+0000)
Subject: Fix indent, and make the mime type matching more consistent
X-Git-Tag: REL_3_7_BETA2~27
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=11b69146c1ece368fac820bcb406557519cb12ab;p=poi.git

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
---

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