You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/09/03 19:13:16 UTC
svn commit: r1881416 - in /poi:
site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
trunk/build.xml trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
Author: kiwiwings
Date: Thu Sep 3 19:13:16 2020
New Revision: 1881416
URL: http://svn.apache.org/viewvc?rev=1881416&view=rev
Log:
add "provided" jars to binary dist bundle
add instruction to pptx rendering
case-insensitive argument handling in PPTX2PNG
Modified:
poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
poi/trunk/build.xml
poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
Modified: poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml?rev=1881416&r1=1881415&r2=1881416&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml (original)
+++ poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml Thu Sep 3 19:13:16 2020
@@ -58,6 +58,19 @@
-charset <cs> sets the default charset to be used, defaults to Windows-1252
]]>
</source>
+
+ <section>
+ <title>Instructions to run</title>
+ <p>Download the <a href="https://ci-builds.apache.org/job/POI/job/POI-DSL-1.8/lastSuccessfulBuild/artifact/build/dist/">current nightly</a></p>
+ <p>Download the "provided" jars (<a href="https://search.maven.org/artifact/org.apache.xmlgraphics/batik-all/1.13/pom">batik-all</a>,
+ <a href="https://search.maven.org/artifact/xml-apis/xml-apis-ext/1.3.04/jar">xml-apis-ext</a>,
+ <a href="https://search.maven.org/artifact/org.apache.xmlgraphics/xmlgraphics-commons/2.4/jar">xmlgraphics-commons</a>) and put them in the directory "auxiliary".</p>
+ <p>Execute the java command (Unix-paths needs to be replaced for Windows - use "-charset" for non-western WMF/EMFs):</p>
+ <source>
+ java -cp poi-5.0.0-SNAPSHOT.jar:poi-ooxml-5.0.0-SNAPSHOT.jar:poi-ooxml-schemas-5.0.0-SNAPSHOT.jar:poi-scratchpad-5.0.0-SNAPSHOT.jar:lib/*:ooxml-lib/*:auxiliary/* org.apache.poi.xslf.util.PPTX2PNG -format png -fixside long -scale 1000 -charset GBK -outdir . file.pptx
+ </source>
+ </section>
+
</section>
<section>
<title>Integrate rendering in your code</title>
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1881416&r1=1881415&r2=1881416&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu Sep 3 19:13:16 2020
@@ -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}/*"/>
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java?rev=1881416&r1=1881415&r2=1881416&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java Thu Sep 3 19:13:16 2020
@@ -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":
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org