pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 20:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

add "provided" jars to binary dist bundle

Browse Source 
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
This commit is contained in:
Andreas Beeker 2020-09-03 19:13:16 +00:00
parent 75578a1de9
commit ea43beeba7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@ -2076,11 +2076,15 @@ under the License.
<globmapper from="*" to="${zipdir}/lib/*"/> <globmapper from="*" to="${zipdir}/lib/*"/>
</mappedresources> </mappedresources>
<mappedresources cache="true"> <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"/> <regexpmapper from="^(.*\.jar)$$" to="${zipdir}/ooxml-lib/\1"/>
</mappedresources> </mappedresources>
<mappedresources cache="true"> <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> <chainedmapper>
<flattenmapper/> <flattenmapper/>
<globmapper from="*" to="${zipdir}/*"/> <globmapper from="*" to="${zipdir}/*"/>

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

@ -116,7 +116,7 @@ public final class PPTX2PNG {
for (int i = 0; i < args.length; i++) { for (int i = 0; i < args.length; i++) {
String opt = (i+1 < args.length) ? args[i+1] : null; String opt = (i+1 < args.length) ? args[i+1] : null;
switch (args[i]) { switch (args[i].toLowerCase(Locale.ROOT)) {
case "-scale": case "-scale":
if (opt != null) { if (opt != null) {
scale = Float.parseFloat(opt); scale = Float.parseFloat(opt);
@ -164,7 +164,7 @@ public final class PPTX2PNG {
fixSide = "long"; fixSide = "long";
} }
break; break;
case "-inputType": case "-inputtype":
if (opt != null) { if (opt != null) {
defaultFileType = FileMagic.valueOf(opt); defaultFileType = FileMagic.valueOf(opt);
i++; i++;
@ -172,13 +172,13 @@ public final class PPTX2PNG {
defaultFileType = FileMagic.OLE2; defaultFileType = FileMagic.OLE2;
} }
break; break;
case "-textAsShapes": case "-textasshapes":
textAsShapes = true; textAsShapes = true;
break; break;
case "-ignoreParse": case "-ignoreparse":
ignoreParse = true; ignoreParse = true;
break; break;
case "-extractEmbedded": case "-extractembedded":
extractEmbedded = true; extractEmbedded = true;
break; break;
case "-charset": case "-charset":