From: Andreas Beeker <kiwiwings@apache.org>
Date: Sun, 5 Jun 2016 10:18:14 +0000 (+0000)
Subject: PPTX2PNG - don't complain about missing output dir, when in testing mode
X-Git-Tag: REL_3_15_BETA2~202
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9ec68c82d423d64d3983ca6ff2be54a8566329c2;p=poi.git

PPTX2PNG - don't complain about missing output dir, when in testing mode

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1746893 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
index 83d944bf22..76d1b59006 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
@@ -94,11 +94,16 @@ public class PPTX2PNG {
             return;
         }
 
+        if (format == null || !format.matches("^(png|gif|jpg|null)$")) {
+            usage("Invalid format given");
+            return;
+        }
+    
         if (outdir == null) {
             outdir = file.getParentFile();
         }
         
-        if (outdir == null || !outdir.exists() || !outdir.isDirectory()) {
+        if (!"null".equals(format) && (outdir == null || !outdir.exists() || !outdir.isDirectory())) {
             usage("Output directory doesn't exist");
             return;
         }
@@ -108,11 +113,6 @@ public class PPTX2PNG {
             return;
         }
         
-        if (format == null || !format.matches("^(png|gif|jpg|null)$")) {
-            usage("Invalid format given");
-            return;
-        }
-    
         if (!quiet) {
             System.out.println("Processing " + file);
         }