diff options
| author | Andreas Beeker <kiwiwings@apache.org> | 2020-09-03 19:13:16 +0000 |
|---|---|---|
| committer | Andreas Beeker <kiwiwings@apache.org> | 2020-09-03 19:13:16 +0000 |
| commit | ea43beeba71a7dd6a12bfb1bc1bcaec7a07d443f (patch) | |
| tree | caf617c5ed9fc36f604662ae5264879786308c2f | |
| parent | 75578a1de9de5699030b8bf917524dc80cac3ca3 (diff) | |
| download | poi-ea43beeba71a7dd6a12bfb1bc1bcaec7a07d443f.tar.gz poi-ea43beeba71a7dd6a12bfb1bc1bcaec7a07d443f.zip | |
add "provided" jars to binary dist bundle
add instruction to pptx rendering
case-insensitive argument handling in PPTX2PNG
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1881416 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build.xml | 8 | ||||
| -rw-r--r-- | src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java | 10 |
2 files changed, 11 insertions, 7 deletions
@@ -2076,11 +2076,15 @@ under the License. <globmapper from="*" to="${zipdir}/lib/*"/> </mappedresources> <mappedresources cache="true"> - <fileset dir="${ooxml.lib}" includes="xmlbeans-*.jar,curvesapi-*.jar,commons-compress*.jar"/> + <fileset dir="${ooxml.lib}"/> <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/ooxml-lib/\1"/> </mappedresources> <mappedresources cache="true"> - <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar"/> + <fileset dir="${ooxml-provided.lib}"/> + <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/auxiliary/\1"/> + </mappedresources> + <mappedresources cache="true"> + <fileset dir="${dist.dir}/maven" includes="**/*.jar" excludes="**/*-javadoc.jar,**/*-sources.jar,**/*-tests.jar"/> <chainedmapper> <flattenmapper/> <globmapper from="*" to="${zipdir}/*"/> 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 07eb12565d..c9336b26c9 100644 --- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java +++ b/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java @@ -116,7 +116,7 @@ public final class PPTX2PNG { for (int i = 0; i < args.length; i++) { String opt = (i+1 < args.length) ? args[i+1] : null; - switch (args[i]) { + switch (args[i].toLowerCase(Locale.ROOT)) { case "-scale": if (opt != null) { scale = Float.parseFloat(opt); @@ -164,7 +164,7 @@ public final class PPTX2PNG { fixSide = "long"; } break; - case "-inputType": + case "-inputtype": if (opt != null) { defaultFileType = FileMagic.valueOf(opt); i++; @@ -172,13 +172,13 @@ public final class PPTX2PNG { defaultFileType = FileMagic.OLE2; } break; - case "-textAsShapes": + case "-textasshapes": textAsShapes = true; break; - case "-ignoreParse": + case "-ignoreparse": ignoreParse = true; break; - case "-extractEmbedded": + case "-extractembedded": extractEmbedded = true; break; case "-charset": |