diff options
Diffstat (limited to 'poi-ooxml/src/test')
| -rw-r--r-- | poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java | 11 | ||||
| -rw-r--r-- | poi-ooxml/src/test/java9/module-info.class | bin | 5076 -> 5119 bytes | |||
| -rw-r--r-- | poi-ooxml/src/test/java9/module-info.java | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java index c94cf59580..a277192172 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java @@ -35,6 +35,7 @@ import java.util.zip.ZipFile; import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry; import org.apache.commons.compress.archivers.sevenz.SevenZFile; +import org.apache.commons.io.FilenameUtils; import org.apache.poi.POIDataSamples; import org.apache.poi.poifs.filesystem.FileMagic; import org.apache.poi.xslf.util.PPTX2PNG; @@ -126,7 +127,6 @@ class TestPPTX2PNG { "-format", format, // png,gif,jpg,svg,pdf or null for test "-slide", "-1", // -1 for all "-outdir", tmpDir.getCanonicalPath(), - "-outpat", "${basename}-${slideno}-${ext}.${format}", // "-dump", new File("build/tmp/", pptFile+".json").getCanonicalPath(), "-dump", "null", "-quiet", @@ -157,17 +157,26 @@ class TestPPTX2PNG { args.add("GBK"); } + final String basename = FilenameUtils.getBaseName(fileName); + final String ext = FilenameUtils.getExtension(fileName); + if (fileObj instanceof ZipEntry) { ZipEntry ze = (ZipEntry)fileObj; ZipFile zf = (ZipFile)fileContainer; System.setIn(zf.getInputStream(ze)); + args.add("-outpat"); + args.add(basename+"-${slideno}-"+ext+".${format}"); args.add("stdin"); } else if (fileObj instanceof SevenZArchiveEntry) { SevenZArchiveEntry ze = (SevenZArchiveEntry)fileObj; SevenZFile zf = (SevenZFile)fileContainer; System.setIn(zf.getInputStream(ze)); + args.add("-outpat"); + args.add(basename+"-${slideno}-"+ext+".${format}"); args.add("stdin"); } else if (fileObj instanceof File) { + args.add("-outpat"); + args.add("${basename}-${slideno}-${ext}.${format}"); args.add(((File)fileObj).getAbsolutePath()); } diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class Binary files differindex d5e072f647..012028ad0b 100644 --- a/poi-ooxml/src/test/java9/module-info.class +++ b/poi-ooxml/src/test/java9/module-info.class diff --git a/poi-ooxml/src/test/java9/module-info.java b/poi-ooxml/src/test/java9/module-info.java index 4d7612ba00..3bb546f87f 100644 --- a/poi-ooxml/src/test/java9/module-info.java +++ b/poi-ooxml/src/test/java9/module-info.java @@ -70,6 +70,7 @@ module org.apache.poi.ooxml { exports org.apache.poi.xssf.streaming; exports org.apache.poi.xssf.util; exports org.apache.poi.xslf.draw; + exports org.apache.poi.xslf.draw.geom; exports org.apache.poi.xslf.usermodel; exports org.apache.poi.xslf.model; exports org.apache.poi.xslf.util; |