Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andreas Beeker 2016-06-05 10:18:14 +00:00
parent 891827cc04
commit 9ec68c82d4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
View File

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