Modified: poi/site/publish/apidocs/org/apache/poi/hslf/blip/WMF.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/blip/WMF.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/blip/WMF.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/blip/WMF.html Wed Aug 5 23:27:06 2015 @@ -111,8 +111,6 @@ <pre>public final class <span class="strong">WMF</span> extends <a href="../../../../../org/apache/poi/hslf/blip/Metafile.html" title="class in org.apache.poi.hslf.blip">Metafile</a></pre> <div class="block">Represents a WMF (Windows Metafile) picture data.</div> -<dl><dt><span class="strong">Author:</span></dt> - <dd>Yegor Kozlov</dd></dl> </li> </ul> </div> @@ -145,6 +143,13 @@ extends <a href="../../../../../org/apac <h3>Nested classes/interfaces inherited from class org.apache.poi.hslf.blip.<a href="../../../../../org/apache/poi/hslf/blip/Metafile.html" title="class in org.apache.poi.hslf.blip">Metafile</a></h3> <code><a href="../../../../../org/apache/poi/hslf/blip/Metafile.Header.html" title="class in org.apache.poi.hslf.blip">Metafile.Header</a></code></li> </ul> +<ul class="blockList"> +<li class="blockList"><a name="nested_classes_inherited_from_class_org.apache.poi.sl.usermodel.PictureData"> +<!-- --> +</a> +<h3>Nested classes/interfaces inherited from interface org.apache.poi.sl.usermodel.<a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></h3> +<code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a></code></li> +</ul> </li> </ul> <!-- =========== FIELD SUMMARY =========== --> @@ -158,7 +163,7 @@ extends <a href="../../../../../org/apac <!-- --> </a> <h3>Fields inherited from class org.apache.poi.hslf.usermodel.<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></h3> -<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#CHECKSUM_SIZE">CHECKSUM_SIZE</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#logger">logger</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#offset">offset</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#uidInstanceCount">uidInstanceCount</a></code></li> +<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#CHECKSUM_SIZE">CHECKSUM_SIZE</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#index">index</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#logger">logger</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#offset">offset</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#uidInstanceCount">uidInstanceCount</a></code></li> </ul> </li> </ul> @@ -192,36 +197,28 @@ extends <a href="../../../../../org/apac <th class="colLast" scope="col">Method and Description</th> </tr> <tr class="altColor"> -<td class="colFirst"><code>java.lang.String</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#getContentType()">getContentType</a></strong>()</code> -<div class="block">Returns content type (mime type) of this picture.</div> -</td> -</tr> -<tr class="rowColor"> <td class="colFirst"><code>byte[]</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#getData()">getData</a></strong>()</code> -<div class="block">Extract compressed WMF data from a ppt</div> +<div class="block">Returns the binary data of this Picture</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>int</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#getSignature()">getSignature</a></strong>()</code> <div class="block">WMF signature is either <code>0x2160</code> or <code>0x2170</code></div> </td> </tr> -<tr class="rowColor"> -<td class="colFirst"><code>int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#getType()">getType</a></strong>()</code> -<div class="block">We are of type <code>Picture.WMF</code></div> -</td> -</tr> <tr class="altColor"> +<td class="colFirst"><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a></code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#getType()">getType</a></strong>()</code> </td> +</tr> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#setData(byte[])">setData</a></strong>(byte[] data)</code> -<div class="block">Set picture data</div> +<div class="block">Sets the binary picture data</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/blip/WMF.html#setSignature(int)">setSignature</a></strong>(int signature)</code> <div class="block">Sets the WMF signature - either <code>0x2160</code> or <code>0x2170</code></div> @@ -240,7 +237,7 @@ extends <a href="../../../../../org/apac <!-- --> </a> <h3>Methods inherited from class org.apache.poi.hslf.usermodel.<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></h3> -<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#create(int)">create</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getChecksum(byte[])">getChecksum</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getHeader()">getHeader</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getOffset()">getOffset</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getRawData()">getRawData</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getSize()">getSize</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getUID()">getUID</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getUIDInstanceCount()">getUIDInstanceCount</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setOffset(int)">setOffset</a>, <a href="../../../../../org/apache/poi/hsl f/usermodel/HSLFPictureData.html#setRawData(byte[])">setRawData</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#write(java.io.OutputStream)">write</a></code></li> +<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#create(org.apache.poi.sl.usermodel.PictureData.PictureType)">create</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getChecksum(byte[])">getChecksum</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getContentType()">getContentType</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getHeader()">getHeader</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getIndex()">getIndex</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getOffset()">getOffset</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getRawData()">getRawData</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getSize()">getSize</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getUID()">getUID</a>, <a href=" ../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getUIDInstanceCount()">getUIDInstanceCount</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setIndex(int)">setIndex</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setOffset(int)">setOffset</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setRawData(byte[])">setRawData</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#write(java.io.OutputStream)">write</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods_inherited_from_class_java.lang.Object"> @@ -287,13 +284,9 @@ extends <a href="../../../../../org/apac <li class="blockList"> <h4>getData</h4> <pre>public byte[] getData()</pre> -<div class="block">Extract compressed WMF data from a ppt</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getData()">getData</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getData()">getData</a></code> in class <code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></dd> -<dt><span class="strong">Returns:</span></dt><dd>picture data</dd></dl> +<div class="block"><strong>Description copied from interface: <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getData()">PictureData</a></code></strong></div> +<div class="block">Returns the binary data of this Picture</div> +<dl><dt><span class="strong">Returns:</span></dt><dd>picture data</dd></dl> </li> </ul> <a name="setData(byte[])"> @@ -304,13 +297,9 @@ extends <a href="../../../../../org/apac <h4>setData</h4> <pre>public void setData(byte[] data) throws java.io.IOException</pre> -<div class="block"><strong>Description copied from class: <code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setData(byte[])">HSLFPictureData</a></code></strong></div> -<div class="block">Set picture data</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#setData(byte[])">setData</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setData(byte[])">setData</a></code> in class <code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></dd> +<div class="block"><strong>Description copied from interface: <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#setData(byte[])">PictureData</a></code></strong></div> +<div class="block">Sets the binary picture data</div> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - picture data</dd> <dt><span class="strong">Throws:</span></dt> <dd><code>java.io.IOException</code></dd></dl> </li> @@ -321,12 +310,8 @@ extends <a href="../../../../../org/apac <ul class="blockList"> <li class="blockList"> <h4>getType</h4> -<pre>public int getType()</pre> -<div class="block">We are of type <code>Picture.WMF</code></div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getType()">getType</a></code> in class <code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></dd> -<dt><span class="strong">Returns:</span></dt><dd>type of this picture.</dd></dl> +<pre>public <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> getType()</pre> +<dl><dt><span class="strong">Returns:</span></dt><dd>the picture type</dd></dl> </li> </ul> <a name="getSignature()"> @@ -346,7 +331,7 @@ extends <a href="../../../../../org/apac <a name="setSignature(int)"> <!-- --> </a> -<ul class="blockList"> +<ul class="blockListLast"> <li class="blockList"> <h4>setSignature</h4> <pre>public void setSignature(int signature)</pre> @@ -357,23 +342,6 @@ extends <a href="../../../../../org/apac </dl> </li> </ul> -<a name="getContentType()"> -<!-- --> -</a> -<ul class="blockListLast"> -<li class="blockList"> -<h4>getContentType</h4> -<pre>public java.lang.String getContentType()</pre> -<div class="block"><strong>Description copied from class: <code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getContentType()">HSLFPictureData</a></code></strong></div> -<div class="block">Returns content type (mime type) of this picture.</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getContentType()">getContentType</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getContentType()">getContentType</a></code> in class <code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></dd> -<dt><span class="strong">Returns:</span></dt><dd>content type of this picture.</dd></dl> -</li> -</ul> </li> </ul> </li>
Modified: poi/site/publish/apidocs/org/apache/poi/hslf/model/ActiveXShape.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/model/ActiveXShape.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/model/ActiveXShape.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/model/ActiveXShape.html Wed Aug 5 23:27:06 2015 @@ -144,13 +144,6 @@ extends <a href="../../../../../org/apac </tr> </table> <ul class="blockList"> -<li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFPictureShape"> -<!-- --> -</a> -<h3>Fields inherited from class org.apache.poi.hslf.usermodel.<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureShape</a></h3> -<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#DIB">DIB</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#EMF">EMF</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#JPEG">JPEG</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PICT">PICT</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PNG">PNG</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#WMF">WMF</a></code></li> -</ul> -<ul class="blockList"> <li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFSimpleShape"> <!-- --> </a> @@ -187,8 +180,8 @@ extends <a href="../../../../../org/apac </tr> <tr class="rowColor"> <td class="colFirst"><code> </code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/model/ActiveXShape.html#ActiveXShape(int,%20int)">ActiveXShape</a></strong>(int movieIdx, - int pictureIdx)</code> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/model/ActiveXShape.html#ActiveXShape(int,%20org.apache.poi.hslf.usermodel.HSLFPictureData)">ActiveXShape</a></strong>(int movieIdx, + <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData)</code> <div class="block">Create a new <code>Picture</code></div> </td> </tr> @@ -332,16 +325,16 @@ extends <a href="../../../../../org/apac <!-- --> </a> <h3>Constructor Detail</h3> -<a name="ActiveXShape(int, int)"> +<a name="ActiveXShape(int, org.apache.poi.hslf.usermodel.HSLFPictureData)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>ActiveXShape</h4> <pre>public ActiveXShape(int movieIdx, - int pictureIdx)</pre> + <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData)</pre> <div class="block">Create a new <code>Picture</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pictureIdx</code> - the index of the picture</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pictureData</code> - the picture data</dd></dl> </li> </ul> <a name="ActiveXShape(org.apache.poi.ddf.EscherContainerRecord, org.apache.poi.sl.usermodel.ShapeContainer)"> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/model/MovieShape.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/model/MovieShape.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/model/MovieShape.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/model/MovieShape.html Wed Aug 5 23:27:06 2015 @@ -150,13 +150,6 @@ extends <a href="../../../../../org/apac </tr> </table> <ul class="blockList"> -<li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFPictureShape"> -<!-- --> -</a> -<h3>Fields inherited from class org.apache.poi.hslf.usermodel.<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureShape</a></h3> -<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#DIB">DIB</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#EMF">EMF</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#JPEG">JPEG</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PICT">PICT</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PNG">PNG</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#WMF">WMF</a></code></li> -</ul> -<ul class="blockList"> <li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFSimpleShape"> <!-- --> </a> @@ -190,14 +183,14 @@ extends <a href="../../../../../org/apac </td> </tr> <tr class="rowColor"> -<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/MovieShape.html#MovieShape(int,%20int)">MovieShape</a></strong>(int movieIdx, - int pictureIdx)</code> +<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/MovieShape.html#MovieShape(int,%20org.apache.poi.hslf.usermodel.HSLFPictureData)">MovieShape</a></strong>(int movieIdx, + <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData)</code> <div class="block">Create a new <code>Picture</code></div> </td> </tr> <tr class="altColor"> -<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/MovieShape.html#MovieShape(int,%20int,%20org.apache.poi.sl.usermodel.ShapeContainer)">MovieShape</a></strong>(int movieIdx, - int idx, +<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/MovieShape.html#MovieShape(int,%20org.apache.poi.hslf.usermodel.HSLFPictureData,%20org.apache.poi.sl.usermodel.ShapeContainer)">MovieShape</a></strong>(int movieIdx, + <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData, <a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</code> <div class="block">Create a new <code>Picture</code></div> </td> @@ -351,29 +344,29 @@ extends <a href="../../../../../org/apac <!-- --> </a> <h3>Constructor Detail</h3> -<a name="MovieShape(int, int)"> +<a name="MovieShape(int, org.apache.poi.hslf.usermodel.HSLFPictureData)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>MovieShape</h4> <pre>public MovieShape(int movieIdx, - int pictureIdx)</pre> + <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData)</pre> <div class="block">Create a new <code>Picture</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pictureIdx</code> - the index of the picture</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pictureData</code> - the picture data</dd></dl> </li> </ul> -<a name="MovieShape(int, int, org.apache.poi.sl.usermodel.ShapeContainer)"> +<a name="MovieShape(int, org.apache.poi.hslf.usermodel.HSLFPictureData, org.apache.poi.sl.usermodel.ShapeContainer)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>MovieShape</h4> <pre>public MovieShape(int movieIdx, - int idx, + <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData, <a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</pre> <div class="block">Create a new <code>Picture</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>idx</code> - the index of the picture</dd><dd><code>parent</code> - the parent shape</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pictureData</code> - the picture data</dd><dd><code>parent</code> - the parent shape</dd></dl> </li> </ul> <a name="MovieShape(org.apache.poi.ddf.EscherContainerRecord, org.apache.poi.sl.usermodel.ShapeContainer)"> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/model/OLEShape.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/model/OLEShape.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/model/OLEShape.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/model/OLEShape.html Wed Aug 5 23:27:06 2015 @@ -142,13 +142,6 @@ extends <a href="../../../../../org/apac </tr> </table> <ul class="blockList"> -<li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFPictureShape"> -<!-- --> -</a> -<h3>Fields inherited from class org.apache.poi.hslf.usermodel.<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureShape</a></h3> -<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#DIB">DIB</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#EMF">EMF</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#JPEG">JPEG</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PICT">PICT</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PNG">PNG</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#WMF">WMF</a></code></li> -</ul> -<ul class="blockList"> <li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFSimpleShape"> <!-- --> </a> @@ -182,12 +175,12 @@ extends <a href="../../../../../org/apac </td> </tr> <tr class="rowColor"> -<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/OLEShape.html#OLEShape(int)">OLEShape</a></strong>(int idx)</code> +<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/OLEShape.html#OLEShape(org.apache.poi.hslf.usermodel.HSLFPictureData)">OLEShape</a></strong>(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</code> <div class="block">Create a new <code>OLEShape</code></div> </td> </tr> <tr class="altColor"> -<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/OLEShape.html#OLEShape(int,%20org.apache.poi.sl.usermodel.ShapeContainer)">OLEShape</a></strong>(int idx, +<td class="colOne"><code><strong><a href="../../../../../org/apache/poi/hslf/model/OLEShape.html#OLEShape(org.apache.poi.hslf.usermodel.HSLFPictureData,%20org.apache.poi.sl.usermodel.ShapeContainer)">OLEShape</a></strong>(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data, <a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</code> <div class="block">Create a new <code>OLEShape</code></div> </td> @@ -339,27 +332,27 @@ extends <a href="../../../../../org/apac <!-- --> </a> <h3>Constructor Detail</h3> -<a name="OLEShape(int)"> +<a name="OLEShape(org.apache.poi.hslf.usermodel.HSLFPictureData)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>OLEShape</h4> -<pre>public OLEShape(int idx)</pre> +<pre>public OLEShape(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</pre> <div class="block">Create a new <code>OLEShape</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>idx</code> - the index of the picture</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - the picture data</dd></dl> </li> </ul> -<a name="OLEShape(int, org.apache.poi.sl.usermodel.ShapeContainer)"> +<a name="OLEShape(org.apache.poi.hslf.usermodel.HSLFPictureData, org.apache.poi.sl.usermodel.ShapeContainer)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>OLEShape</h4> -<pre>public OLEShape(int idx, +<pre>public OLEShape(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data, <a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</pre> <div class="block">Create a new <code>OLEShape</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>idx</code> - the index of the picture</dd><dd><code>parent</code> - the parent shape</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - the picture data</dd><dd><code>parent</code> - the parent shape</dd></dl> </li> </ul> <a name="OLEShape(org.apache.poi.ddf.EscherContainerRecord, org.apache.poi.sl.usermodel.ShapeContainer)"> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFFill.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFFill.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFFill.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFFill.html Wed Aug 5 23:27:06 2015 @@ -279,7 +279,7 @@ extends java.lang.Object</pre> </tr> <tr class="altColor"> <td class="colFirst"><code>void</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFFill.html#setPictureData(int)">setPictureData</a></strong>(int idx)</code> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFFill.html#setPictureData(org.apache.poi.hslf.usermodel.HSLFPictureData)">setPictureData</a></strong>(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</code> <div class="block">Assign picture used to fill the underlying shape.</div> </td> </tr> @@ -565,15 +565,15 @@ extends java.lang.Object</pre> <div class="block"><code>PictureData</code> object used in a texture, pattern of picture fill.</div> </li> </ul> -<a name="setPictureData(int)"> +<a name="setPictureData(org.apache.poi.hslf.usermodel.HSLFPictureData)"> <!-- --> </a> <ul class="blockListLast"> <li class="blockList"> <h4>setPictureData</h4> -<pre>public void setPictureData(int idx)</pre> +<pre>public void setPictureData(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</pre> <div class="block">Assign picture used to fill the underlying shape.</div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>idx</code> - 0-based index of the picture added to this ppt by <code>SlideShow.addPicture</code> method.</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - the picture data added to this ppt by <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(byte[],%20org.apache.poi.sl.usermodel.PictureData.PictureType)"><code>HSLFSlideShow.addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)</code></a> method.</dd></dl> </li> </ul> </li> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFGroupShape.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFGroupShape.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFGroupShape.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFGroupShape.html Wed Aug 5 23:27:06 2015 @@ -209,47 +209,43 @@ implements <a href="../../../../../org/a </td> </tr> <tr class="altColor"> -<td class="colFirst"><code>protected java.util.List<<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>></code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapeList()">getShapeList</a></strong>()</code> </td> -</tr> -<tr class="rowColor"> <td class="colFirst"><code>java.util.List<<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>></code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapes()">getShapes</a></strong>()</code> <div class="block">Returns an list containing all of the elements in this container in proper sequence (from first to last element).</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeType.html" title="enum in org.apache.poi.sl.usermodel">ShapeType</a></code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapeType()">getShapeType</a></strong>()</code> <div class="block">Return type of the shape.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>java.util.Iterator<<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>></code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#iterator()">iterator</a></strong>()</code> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#moveTo(int,%20int)">moveTo</a></strong>(int x, int y)</code> <div class="block">Moves this <code>ShapeGroup</code> to the specified location.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>boolean</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#removeShape(org.apache.poi.hslf.usermodel.HSLFShape)">removeShape</a></strong>(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a> shape)</code> <div class="block">Removes the specified shape from this sheet, if it is present (optional operation).</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#setAnchor(java.awt.Rectangle)">setAnchor</a></strong>(java.awt.Rectangle anchor)</code> <div class="block">Sets the anchor (the bounding box rectangle) of this shape.</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#setInteriorAnchor(java.awt.geom.Rectangle2D)">setInteriorAnchor</a></strong>(java.awt.geom.Rectangle2D anchor)</code> <div class="block">Sets the coordinate space of this group.</div> @@ -328,23 +324,6 @@ implements <a href="../../../../../org/a <!-- --> </a> <h3>Method Detail</h3> -<a name="getShapes()"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>getShapes</h4> -<pre>public java.util.List<<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> getShapes()</pre> -<div class="block"><strong>Description copied from interface: <code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html#getShapes()">ShapeContainer</a></code></strong></div> -<div class="block">Returns an list containing all of the elements in this container in proper - sequence (from first to last element).</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html#getShapes()">getShapes</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>></code></dd> -<dt><span class="strong">Returns:</span></dt><dd>an list containing all of the elements in this container in proper - sequence</dd></dl> -</li> -</ul> <a name="setAnchor(java.awt.Rectangle)"> <!-- --> </a> @@ -518,14 +497,20 @@ implements <a href="../../../../../org/a <dt><span class="strong">Returns:</span></dt><dd><tt>true</tt> if this sheet contained the specified element</dd></dl> </li> </ul> -<a name="getShapeList()"> +<a name="getShapes()"> <!-- --> </a> <ul class="blockListLast"> <li class="blockList"> -<h4>getShapeList</h4> -<pre>protected java.util.List<<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> getShapeList()</pre> -<dl><dt><span class="strong">Returns:</span></dt><dd>the shapes contained in this group container</dd></dl> +<h4>getShapes</h4> +<pre>public java.util.List<<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> getShapes()</pre> +<div class="block"><strong>Description copied from interface: <code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html#getShapes()">ShapeContainer</a></code></strong></div> +<div class="block">Returns an list containing all of the elements in this container in proper + sequence (from first to last element).</div> +<dl> +<dt><strong>Specified by:</strong></dt> +<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html#getShapes()">getShapes</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>></code></dd> +<dt><span class="strong">Returns:</span></dt><dd>the shapes contained in this group container</dd></dl> </li> </ul> </li> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFNotes.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFNotes.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFNotes.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFNotes.html Wed Aug 5 23:27:06 2015 @@ -235,7 +235,7 @@ implements <a href="../../../../../org/a <ul class="blockListLast"> <li class="blockList"> <h4>logger</h4> -<pre>protected static <a href="../../../../../org/apache/poi/util/POILogger.html" title="class in org.apache.poi.util">POILogger</a> logger</pre> +<pre>protected static final <a href="../../../../../org/apache/poi/util/POILogger.html" title="class in org.apache.poi.util">POILogger</a> logger</pre> </li> </ul> </li> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureData.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureData.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureData.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureData.html Wed Aug 5 23:27:06 2015 @@ -114,6 +114,21 @@ implements <a href="../../../../../org/a <div class="summary"> <ul class="blockList"> <li class="blockList"> +<!-- ======== NESTED CLASS SUMMARY ======== --> +<ul class="blockList"> +<li class="blockList"><a name="nested_class_summary"> +<!-- --> +</a> +<h3>Nested Class Summary</h3> +<ul class="blockList"> +<li class="blockList"><a name="nested_classes_inherited_from_class_org.apache.poi.sl.usermodel.PictureData"> +<!-- --> +</a> +<h3>Nested classes/interfaces inherited from interface org.apache.poi.sl.usermodel.<a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></h3> +<code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a></code></li> +</ul> +</li> +</ul> <!-- =========== FIELD SUMMARY =========== --> <ul class="blockList"> <li class="blockList"><a name="field_summary"> @@ -133,16 +148,22 @@ implements <a href="../../../../../org/a </td> </tr> <tr class="rowColor"> +<td class="colFirst"><code>protected int</code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#index">index</a></strong></code> +<div class="block">The 1-based index within the pictures stream</div> +</td> +</tr> +<tr class="altColor"> <td class="colFirst"><code>protected <a href="../../../../../org/apache/poi/util/POILogger.html" title="class in org.apache.poi.util">POILogger</a></code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#logger">logger</a></strong></code> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>protected int</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#offset">offset</a></strong></code> <div class="block">The offset to the picture in the stream</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>protected int</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#uidInstanceCount">uidInstanceCount</a></strong></code> <div class="block">The instance type/signatures defines if one or two UID instances will be included</div> @@ -182,7 +203,7 @@ implements <a href="../../../../../org/a </tr> <tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#create(int)">create</a></strong>(int type)</code> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#create(org.apache.poi.sl.usermodel.PictureData.PictureType)">create</a></strong>(<a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> type)</code> <div class="block">Create an instance of <code>PictureData</code> by type.</div> </td> </tr> @@ -193,23 +214,21 @@ implements <a href="../../../../../org/a </td> </tr> <tr class="altColor"> -<td class="colFirst"><code>abstract java.lang.String</code></td> +<td class="colFirst"><code>java.lang.String</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getContentType()">getContentType</a></strong>()</code> <div class="block">Returns content type (mime type) of this picture.</div> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>abstract byte[]</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getData()">getData</a></strong>()</code> -<div class="block">Returns the binary data of this Picture</div> -</td> -</tr> -<tr class="altColor"> <td class="colFirst"><code>byte[]</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getHeader()">getHeader</a></strong>()</code> <div class="block">Return 24 byte header which preceeds the actual picture data.</div> </td> </tr> +<tr class="altColor"> +<td class="colFirst"><code>int</code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getIndex()">getIndex</a></strong>()</code> </td> +</tr> <tr class="rowColor"> <td class="colFirst"><code>int</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getOffset()">getOffset</a></strong>()</code> @@ -238,44 +257,36 @@ implements <a href="../../../../../org/a </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>abstract int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getType()">getType</a></strong>()</code> -<div class="block">Returns type of this picture.</div> -</td> -</tr> -<tr class="altColor"> <td class="colFirst"><code>byte[]</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getUID()">getUID</a></strong>()</code> <div class="block">Returns 16-byte checksum of this picture</div> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>protected int</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#getUIDInstanceCount()">getUIDInstanceCount</a></strong>()</code> <div class="block">The instance type/signatures defines if one or two UID instances will be included</div> </td> </tr> -<tr class="altColor"> -<td class="colFirst"><code>abstract void</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setData(byte[])">setData</a></strong>(byte[] data)</code> -<div class="block">Set picture data</div> -</td> -</tr> <tr class="rowColor"> <td class="colFirst"><code>void</code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setIndex(int)">setIndex</a></strong>(int index)</code> </td> +</tr> +<tr class="altColor"> +<td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setOffset(int)">setOffset</a></strong>(int offset)</code> <div class="block">Set offset of this picture in the 'Pictures' stream.</div> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setRawData(byte[])">setRawData</a></strong>(byte[] data)</code> </td> </tr> -<tr class="rowColor"> +<tr class="altColor"> <td class="colFirst"><code>abstract void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#setSignature(int)">setSignature</a></strong>(int signature)</code> </td> </tr> -<tr class="altColor"> +<tr class="rowColor"> <td class="colFirst"><code>void</code></td> <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#write(java.io.OutputStream)">write</a></strong>(java.io.OutputStream out)</code> <div class="block">Write this picture into <code>OutputStream</code></div> @@ -289,6 +300,13 @@ implements <a href="../../../../../org/a <h3>Methods inherited from class java.lang.Object</h3> <code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li> </ul> +<ul class="blockList"> +<li class="blockList"><a name="methods_inherited_from_class_org.apache.poi.sl.usermodel.PictureData"> +<!-- --> +</a> +<h3>Methods inherited from interface org.apache.poi.sl.usermodel.<a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></h3> +<code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getData()">getData</a>, <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getType()">getType</a>, <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#setData(byte[])">setData</a></code></li> +</ul> </li> </ul> </li> @@ -336,13 +354,23 @@ implements <a href="../../../../../org/a <a name="uidInstanceCount"> <!-- --> </a> -<ul class="blockListLast"> +<ul class="blockList"> <li class="blockList"> <h4>uidInstanceCount</h4> <pre>protected int uidInstanceCount</pre> <div class="block">The instance type/signatures defines if one or two UID instances will be included</div> </li> </ul> +<a name="index"> +<!-- --> +</a> +<ul class="blockListLast"> +<li class="blockList"> +<h4>index</h4> +<pre>protected int index</pre> +<div class="block">The 1-based index within the pictures stream</div> +</li> +</ul> </li> </ul> <!-- ========= CONSTRUCTOR DETAIL ======== --> @@ -368,62 +396,6 @@ implements <a href="../../../../../org/a <!-- --> </a> <h3>Method Detail</h3> -<a name="getType()"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>getType</h4> -<pre>public abstract int getType()</pre> -<div class="block">Returns type of this picture. - Must be one of the static constants defined in the <code>Picture<code> class.</div> -<dl><dt><span class="strong">Returns:</span></dt><dd>type of this picture.</dd></dl> -</li> -</ul> -<a name="getContentType()"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>getContentType</h4> -<pre>public abstract java.lang.String getContentType()</pre> -<div class="block">Returns content type (mime type) of this picture.</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getContentType()">getContentType</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> -<dt><span class="strong">Returns:</span></dt><dd>content type of this picture.</dd></dl> -</li> -</ul> -<a name="getData()"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>getData</h4> -<pre>public abstract byte[] getData()</pre> -<div class="block">Returns the binary data of this Picture</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getData()">getData</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> -<dt><span class="strong">Returns:</span></dt><dd>picture data</dd></dl> -</li> -</ul> -<a name="setData(byte[])"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>setData</h4> -<pre>public abstract void setData(byte[] data) - throws java.io.IOException</pre> -<div class="block">Set picture data</div> -<dl> -<dt><strong>Specified by:</strong></dt> -<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#setData(byte[])">setData</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> -<dt><span class="strong">Throws:</span></dt> -<dd><code>java.io.IOException</code></dd></dl> -</li> -</ul> <a name="getSignature()"> <!-- --> </a> @@ -530,13 +502,13 @@ implements <a href="../../../../../org/a <dd><code>java.io.IOException</code></dd></dl> </li> </ul> -<a name="create(int)"> +<a name="create(org.apache.poi.sl.usermodel.PictureData.PictureType)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>create</h4> -<pre>public static <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> create(int type)</pre> +<pre>public static <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> create(<a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> type)</pre> <div class="block">Create an instance of <code>PictureData</code> by type.</div> <dl><dt><span class="strong">Parameters:</span></dt><dd><code>type</code> - type of the picture data. Must be one of the static constants defined in the <code>Picture<code> class.</dd> @@ -561,7 +533,7 @@ implements <a href="../../../../../org/a <a name="getSize()"> <!-- --> </a> -<ul class="blockListLast"> +<ul class="blockList"> <li class="blockList"> <h4>getSize</h4> <pre>public int getSize()</pre> @@ -570,6 +542,41 @@ implements <a href="../../../../../org/a <dl><dt><span class="strong">Returns:</span></dt><dd>the size of the picture in bytes</dd></dl> </li> </ul> +<a name="getIndex()"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>getIndex</h4> +<pre>public int getIndex()</pre> +<dl><dt><span class="strong">Returns:</span></dt><dd>the 1-based index of this pictures within the pictures stream</dd></dl> +</li> +</ul> +<a name="setIndex(int)"> +<!-- --> +</a> +<ul class="blockList"> +<li class="blockList"> +<h4>setIndex</h4> +<pre>public void setIndex(int index)</pre> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>index</code> - sets the 1-based index of this pictures within the pictures stream</dd></dl> +</li> +</ul> +<a name="getContentType()"> +<!-- --> +</a> +<ul class="blockListLast"> +<li class="blockList"> +<h4>getContentType</h4> +<pre>public final java.lang.String getContentType()</pre> +<div class="block"><strong>Description copied from interface: <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getContentType()">PictureData</a></code></strong></div> +<div class="block">Returns content type (mime type) of this picture.</div> +<dl> +<dt><strong>Specified by:</strong></dt> +<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html#getContentType()">getContentType</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/PictureData.html" title="interface in org.apache.poi.sl.usermodel">PictureData</a></code></dd> +<dt><span class="strong">Returns:</span></dt><dd>content type of this picture.</dd></dl> +</li> +</ul> </li> </ul> </li> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureShape.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureShape.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureShape.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFPictureShape.html Wed Aug 5 23:27:06 2015 @@ -60,13 +60,13 @@ <ul class="subNavList"> <li>Summary: </li> <li>Nested | </li> -<li><a href="#field_summary">Field</a> | </li> +<li><a href="#fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFSimpleShape">Field</a> | </li> <li><a href="#constructor_summary">Constr</a> | </li> <li><a href="#method_summary">Method</a></li> </ul> <ul class="subNavList"> <li>Detail: </li> -<li><a href="#field_detail">Field</a> | </li> +<li>Field | </li> <li><a href="#constructor_detail">Constr</a> | </li> <li><a href="#method_detail">Method</a></li> </ul> @@ -130,49 +130,6 @@ implements <a href="../../../../../org/a <!-- --> </a> <h3>Field Summary</h3> -<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation"> -<caption><span>Fields</span><span class="tabEnd"> </span></caption> -<tr> -<th class="colFirst" scope="col">Modifier and Type</th> -<th class="colLast" scope="col">Field and Description</th> -</tr> -<tr class="altColor"> -<td class="colFirst"><code>static byte</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#DIB">DIB</a></strong></code> -<div class="block">Windows DIB (BMP)</div> -</td> -</tr> -<tr class="rowColor"> -<td class="colFirst"><code>static int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#EMF">EMF</a></strong></code> -<div class="block">Windows Enhanced Metafile (EMF)</div> -</td> -</tr> -<tr class="altColor"> -<td class="colFirst"><code>static int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#JPEG">JPEG</a></strong></code> -<div class="block">JPEG</div> -</td> -</tr> -<tr class="rowColor"> -<td class="colFirst"><code>static int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PICT">PICT</a></strong></code> -<div class="block">Macintosh PICT</div> -</td> -</tr> -<tr class="altColor"> -<td class="colFirst"><code>static int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#PNG">PNG</a></strong></code> -<div class="block">PNG</div> -</td> -</tr> -<tr class="rowColor"> -<td class="colFirst"><code>static int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#WMF">WMF</a></strong></code> -<div class="block">Windows Metafile (WMF)</div> -</td> -</tr> -</table> <ul class="blockList"> <li class="blockList"><a name="fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFSimpleShape"> <!-- --> @@ -210,13 +167,13 @@ implements <a href="../../../../../org/a </tr> <tr class="rowColor"> <td class="colFirst"><code> </code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#HSLFPictureShape(int)">HSLFPictureShape</a></strong>(int idx)</code> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#HSLFPictureShape(org.apache.poi.hslf.usermodel.HSLFPictureData)">HSLFPictureShape</a></strong>(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</code> <div class="block">Create a new <code>Picture</code></div> </td> </tr> <tr class="altColor"> <td class="colFirst"><code> </code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#HSLFPictureShape(int,%20org.apache.poi.sl.usermodel.ShapeContainer)">HSLFPictureShape</a></strong>(int idx, +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#HSLFPictureShape(org.apache.poi.hslf.usermodel.HSLFPictureData,%20org.apache.poi.sl.usermodel.ShapeContainer)">HSLFPictureShape</a></strong>(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data, <a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</code> <div class="block">Create a new <code>Picture</code></div> </td> @@ -347,107 +304,33 @@ implements <a href="../../../../../org/a <div class="details"> <ul class="blockList"> <li class="blockList"> -<!-- ============ FIELD DETAIL =========== --> -<ul class="blockList"> -<li class="blockList"><a name="field_detail"> -<!-- --> -</a> -<h3>Field Detail</h3> -<a name="EMF"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>EMF</h4> -<pre>public static final int EMF</pre> -<div class="block">Windows Enhanced Metafile (EMF)</div> -<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.poi.hslf.usermodel.HSLFPictureShape.EMF">Constant Field Values</a></dd></dl> -</li> -</ul> -<a name="WMF"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>WMF</h4> -<pre>public static final int WMF</pre> -<div class="block">Windows Metafile (WMF)</div> -<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.poi.hslf.usermodel.HSLFPictureShape.WMF">Constant Field Values</a></dd></dl> -</li> -</ul> -<a name="PICT"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>PICT</h4> -<pre>public static final int PICT</pre> -<div class="block">Macintosh PICT</div> -<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.poi.hslf.usermodel.HSLFPictureShape.PICT">Constant Field Values</a></dd></dl> -</li> -</ul> -<a name="JPEG"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>JPEG</h4> -<pre>public static final int JPEG</pre> -<div class="block">JPEG</div> -<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.poi.hslf.usermodel.HSLFPictureShape.JPEG">Constant Field Values</a></dd></dl> -</li> -</ul> -<a name="PNG"> -<!-- --> -</a> -<ul class="blockList"> -<li class="blockList"> -<h4>PNG</h4> -<pre>public static final int PNG</pre> -<div class="block">PNG</div> -<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.poi.hslf.usermodel.HSLFPictureShape.PNG">Constant Field Values</a></dd></dl> -</li> -</ul> -<a name="DIB"> -<!-- --> -</a> -<ul class="blockListLast"> -<li class="blockList"> -<h4>DIB</h4> -<pre>public static final byte DIB</pre> -<div class="block">Windows DIB (BMP)</div> -<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../constant-values.html#org.apache.poi.hslf.usermodel.HSLFPictureShape.DIB">Constant Field Values</a></dd></dl> -</li> -</ul> -</li> -</ul> <!-- ========= CONSTRUCTOR DETAIL ======== --> <ul class="blockList"> <li class="blockList"><a name="constructor_detail"> <!-- --> </a> <h3>Constructor Detail</h3> -<a name="HSLFPictureShape(int)"> +<a name="HSLFPictureShape(org.apache.poi.hslf.usermodel.HSLFPictureData)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>HSLFPictureShape</h4> -<pre>public HSLFPictureShape(int idx)</pre> +<pre>public HSLFPictureShape(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</pre> <div class="block">Create a new <code>Picture</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>idx</code> - the index of the picture</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - the picture data</dd></dl> </li> </ul> -<a name="HSLFPictureShape(int, org.apache.poi.sl.usermodel.ShapeContainer)"> +<a name="HSLFPictureShape(org.apache.poi.hslf.usermodel.HSLFPictureData, org.apache.poi.sl.usermodel.ShapeContainer)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>HSLFPictureShape</h4> -<pre>public HSLFPictureShape(int idx, +<pre>public HSLFPictureShape(<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data, <a href="../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</pre> <div class="block">Create a new <code>Picture</code></div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>idx</code> - the index of the picture</dd><dd><code>parent</code> - the parent shape</dd></dl> +<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - the picture data</dd><dd><code>parent</code> - the parent shape</dd></dl> </li> </ul> <a name="HSLFPictureShape(org.apache.poi.ddf.EscherContainerRecord, org.apache.poi.sl.usermodel.ShapeContainer)"> @@ -637,13 +520,13 @@ implements <a href="../../../../../org/a <ul class="subNavList"> <li>Summary: </li> <li>Nested | </li> -<li><a href="#field_summary">Field</a> | </li> +<li><a href="#fields_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFSimpleShape">Field</a> | </li> <li><a href="#constructor_summary">Constr</a> | </li> <li><a href="#method_summary">Method</a></li> </ul> <ul class="subNavList"> <li>Detail: </li> -<li><a href="#field_detail">Field</a> | </li> +<li>Field | </li> <li><a href="#constructor_detail">Constr</a> | </li> <li><a href="#method_detail">Method</a></li> </ul> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFSlideShow.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFSlideShow.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFSlideShow.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFSlideShow.html Wed Aug 5 23:27:06 2015 @@ -192,16 +192,16 @@ implements <a href="../../../../../org/a <td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPersistentObject(org.apache.poi.hslf.record.PositionDependentRecord)">addPersistentObject</a></strong>(<a href="../../../../../org/apache/poi/hslf/record/PositionDependentRecord.html" title="interface in org.apache.poi.hslf.record">PositionDependentRecord</a> slideRecord)</code> </td> </tr> <tr class="altColor"> -<td class="colFirst"><code>int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(byte[],%20int)">addPicture</a></strong>(byte[] data, - int format)</code> -<div class="block">Adds a picture to this presentation and returns the associated index.</div> +<td class="colFirst"><code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(byte[],%20org.apache.poi.sl.usermodel.PictureData.PictureType)">addPicture</a></strong>(byte[] data, + <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> format)</code> +<div class="block">Adds a picture to the workbook.</div> </td> </tr> <tr class="rowColor"> -<td class="colFirst"><code>int</code></td> -<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(java.io.File,%20int)">addPicture</a></strong>(java.io.File pict, - int format)</code> +<td class="colFirst"><code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></td> +<td class="colLast"><code><strong><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(java.io.File,%20org.apache.poi.sl.usermodel.PictureData.PictureType)">addPicture</a></strong>(java.io.File pict, + <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> format)</code> <div class="block">Adds a picture to this presentation and returns the associated index.</div> </td> </tr> @@ -601,32 +601,35 @@ implements <a href="../../../../../org/a <dt><span class="strong">Returns:</span></dt><dd>the created <code>Slide</code></dd></dl> </li> </ul> -<a name="addPicture(byte[], int)"> +<a name="addPicture(byte[], org.apache.poi.sl.usermodel.PictureData.PictureType)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>addPicture</h4> -<pre>public int addPicture(byte[] data, - int format) - throws java.io.IOException</pre> -<div class="block">Adds a picture to this presentation and returns the associated index.</div> -<dl><dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - picture data</dd><dd><code>format</code> - the format of the picture. One of constans defined in the - <code>Picture</code> class.</dd> -<dt><span class="strong">Returns:</span></dt><dd>the index to this picture (1 based).</dd> +<pre>public <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> addPicture(byte[] data, + <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> format) + throws java.io.IOException</pre> +<div class="block"><strong>Description copied from interface: <code><a href="../../../../../org/apache/poi/sl/usermodel/SlideShow.html#addPicture(byte[],%20org.apache.poi.sl.usermodel.PictureData.PictureType)">SlideShow</a></code></strong></div> +<div class="block">Adds a picture to the workbook.</div> +<dl> +<dt><strong>Specified by:</strong></dt> +<dd><code><a href="../../../../../org/apache/poi/sl/usermodel/SlideShow.html#addPicture(byte[],%20org.apache.poi.sl.usermodel.PictureData.PictureType)">addPicture</a></code> in interface <code><a href="../../../../../org/apache/poi/sl/usermodel/SlideShow.html" title="interface in org.apache.poi.sl.usermodel">SlideShow</a></code></dd> +<dt><span class="strong">Parameters:</span></dt><dd><code>data</code> - The bytes of the picture</dd><dd><code>format</code> - The format of the picture.</dd> +<dt><span class="strong">Returns:</span></dt><dd>the new picture reference</dd> <dt><span class="strong">Throws:</span></dt> <dd><code>java.io.IOException</code></dd></dl> </li> </ul> -<a name="addPicture(java.io.File, int)"> +<a name="addPicture(java.io.File, org.apache.poi.sl.usermodel.PictureData.PictureType)"> <!-- --> </a> <ul class="blockList"> <li class="blockList"> <h4>addPicture</h4> -<pre>public int addPicture(java.io.File pict, - int format) - throws java.io.IOException</pre> +<pre>public <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> addPicture(java.io.File pict, + <a href="../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> format) + throws java.io.IOException</pre> <div class="block">Adds a picture to this presentation and returns the associated index.</div> <dl><dt><span class="strong">Parameters:</span></dt><dd><code>pict</code> - the file containing the image to add</dd><dd><code>format</code> - the format of the picture. One of constans defined in the <code>Picture</code> class.</dd> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTable.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTable.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTable.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTable.html Wed Aug 5 23:27:06 2015 @@ -292,7 +292,7 @@ implements <a href="../../../../../org/a <!-- --> </a> <h3>Methods inherited from class org.apache.poi.hslf.usermodel.<a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFGroupShape</a></h3> -<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#addShape(org.apache.poi.hslf.usermodel.HSLFShape)">addShape</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#createSpContainer(boolean)">createSpContainer</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getAnchor2D()">getAnchor2D</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getEscherChild(int)">getEscherChild</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getHyperlink()">getHyperlink</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getInteriorAnchor()">getInteriorAnchor</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapeList()">getShapeList</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapes()">getShapes</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.h tml#getShapeType()">getShapeType</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#iterator()">iterator</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#moveTo(int,%20int)">moveTo</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#removeShape(org.apache.poi.hslf.usermodel.HSLFShape)">removeShape</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#setAnchor(java.awt.Rectangle)">setAnchor</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#setInteriorAnchor(java.awt.geom.Rectangle2D)">setInteriorAnchor</a></code></li> +<code><a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#addShape(org.apache.poi.hslf.usermodel.HSLFShape)">addShape</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#createSpContainer(boolean)">createSpContainer</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getAnchor2D()">getAnchor2D</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getEscherChild(int)">getEscherChild</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getHyperlink()">getHyperlink</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getInteriorAnchor()">getInteriorAnchor</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapes()">getShapes</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#getShapeType()">getShapeType</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.h tml#iterator()">iterator</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#moveTo(int,%20int)">moveTo</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#removeShape(org.apache.poi.hslf.usermodel.HSLFShape)">removeShape</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#setAnchor(java.awt.Rectangle)">setAnchor</a>, <a href="../../../../../org/apache/poi/hslf/usermodel/HSLFGroupShape.html#setInteriorAnchor(java.awt.geom.Rectangle2D)">setInteriorAnchor</a></code></li> </ul> <ul class="blockList"> <li class="blockList"><a name="methods_inherited_from_class_org.apache.poi.hslf.usermodel.HSLFShape"> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTextParagraph.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTextParagraph.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTextParagraph.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/HSLFTextParagraph.html Wed Aug 5 23:27:06 2015 @@ -623,7 +623,7 @@ implements <a href="../../../../../org/a <ul class="blockList"> <li class="blockList"> <h4>logger</h4> -<pre>protected static <a href="../../../../../org/apache/poi/util/POILogger.html" title="class in org.apache.poi.util">POILogger</a> logger</pre> +<pre>protected static final <a href="../../../../../org/apache/poi/util/POILogger.html" title="class in org.apache.poi.util">POILogger</a> logger</pre> </li> </ul> <a name="_ruler"> Modified: poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/class-use/HSLFPictureData.html URL: http://svn.apache.org/viewvc/poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/class-use/HSLFPictureData.html?rev=1694374&r1=1694373&r2=1694374&view=diff ============================================================================== --- poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/class-use/HSLFPictureData.html (original) +++ poi/site/publish/apidocs/org/apache/poi/hslf/usermodel/class-use/HSLFPictureData.html Wed Aug 5 23:27:06 2015 @@ -78,6 +78,10 @@ <td class="colLast"> </td> </tr> <tr class="rowColor"> +<td class="colFirst"><a href="#org.apache.poi.hslf.model">org.apache.poi.hslf.model</a></td> +<td class="colLast"> </td> +</tr> +<tr class="altColor"> <td class="colFirst"><a href="#org.apache.poi.hslf.usermodel">org.apache.poi.hslf.usermodel</a></td> <td class="colLast"> </td> </tr> @@ -148,6 +152,49 @@ </tbody> </table> </li> +<li class="blockList"><a name="org.apache.poi.hslf.model"> +<!-- --> +</a> +<h3>Uses of <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> in <a href="../../../../../../org/apache/poi/hslf/model/package-summary.html">org.apache.poi.hslf.model</a></h3> +<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation"> +<caption><span>Constructors in <a href="../../../../../../org/apache/poi/hslf/model/package-summary.html">org.apache.poi.hslf.model</a> with parameters of type <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></span><span class="tabEnd"> </span></caption> +<tr> +<th class="colOne" scope="col">Constructor and Description</th> +</tr> +<tbody> +<tr class="altColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/model/ActiveXShape.html#ActiveXShape(int,%20org.apache.poi.hslf.usermodel.HSLFPictureData)">ActiveXShape</a></strong>(int movieIdx, + <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData)</code> +<div class="block">Create a new <code>Picture</code></div> +</td> +</tr> +<tr class="rowColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/model/MovieShape.html#MovieShape(int,%20org.apache.poi.hslf.usermodel.HSLFPictureData)">MovieShape</a></strong>(int movieIdx, + <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData)</code> +<div class="block">Create a new <code>Picture</code></div> +</td> +</tr> +<tr class="altColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/model/MovieShape.html#MovieShape(int,%20org.apache.poi.hslf.usermodel.HSLFPictureData,%20org.apache.poi.sl.usermodel.ShapeContainer)">MovieShape</a></strong>(int movieIdx, + <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> pictureData, + <a href="../../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</code> +<div class="block">Create a new <code>Picture</code></div> +</td> +</tr> +<tr class="rowColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/model/OLEShape.html#OLEShape(org.apache.poi.hslf.usermodel.HSLFPictureData)">OLEShape</a></strong>(<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</code> +<div class="block">Create a new <code>OLEShape</code></div> +</td> +</tr> +<tr class="altColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/model/OLEShape.html#OLEShape(org.apache.poi.hslf.usermodel.HSLFPictureData,%20org.apache.poi.sl.usermodel.ShapeContainer)">OLEShape</a></strong>(<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data, + <a href="../../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</code> +<div class="block">Create a new <code>OLEShape</code></div> +</td> +</tr> +</tbody> +</table> +</li> <li class="blockList"><a name="org.apache.poi.hslf.usermodel"> <!-- --> </a> @@ -160,8 +207,20 @@ </tr> <tbody> <tr class="altColor"> +<td class="colFirst"><code><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></td> +<td class="colLast"><span class="strong">HSLFSlideShow.</span><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(byte[],%20org.apache.poi.sl.usermodel.PictureData.PictureType)">addPicture</a></strong>(byte[] data, + <a href="../../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> format)</code> </td> +</tr> +<tr class="rowColor"> +<td class="colFirst"><code><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></td> +<td class="colLast"><span class="strong">HSLFSlideShow.</span><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFSlideShow.html#addPicture(java.io.File,%20org.apache.poi.sl.usermodel.PictureData.PictureType)">addPicture</a></strong>(java.io.File pict, + <a href="../../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> format)</code> +<div class="block">Adds a picture to this presentation and returns the associated index.</div> +</td> +</tr> +<tr class="altColor"> <td class="colFirst"><code>static <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></code></td> -<td class="colLast"><span class="strong">HSLFPictureData.</span><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#create(int)">create</a></strong>(int type)</code> +<td class="colLast"><span class="strong">HSLFPictureData.</span><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html#create(org.apache.poi.sl.usermodel.PictureData.PictureType)">create</a></strong>(<a href="../../../../../../org/apache/poi/sl/usermodel/PictureData.PictureType.html" title="enum in org.apache.poi.sl.usermodel">PictureData.PictureType</a> type)</code> <div class="block">Create an instance of <code>PictureData</code> by type.</div> </td> </tr> @@ -202,6 +261,31 @@ <div class="block">Add a new picture to this presentation.</div> </td> </tr> +<tr class="rowColor"> +<td class="colFirst"><code>void</code></td> +<td class="colLast"><span class="strong">HSLFFill.</span><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFFill.html#setPictureData(org.apache.poi.hslf.usermodel.HSLFPictureData)">setPictureData</a></strong>(<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</code> +<div class="block">Assign picture used to fill the underlying shape.</div> +</td> +</tr> +</tbody> +</table> +<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing constructors, and an explanation"> +<caption><span>Constructors in <a href="../../../../../../org/apache/poi/hslf/usermodel/package-summary.html">org.apache.poi.hslf.usermodel</a> with parameters of type <a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a></span><span class="tabEnd"> </span></caption> +<tr> +<th class="colOne" scope="col">Constructor and Description</th> +</tr> +<tbody> +<tr class="altColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#HSLFPictureShape(org.apache.poi.hslf.usermodel.HSLFPictureData)">HSLFPictureShape</a></strong>(<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data)</code> +<div class="block">Create a new <code>Picture</code></div> +</td> +</tr> +<tr class="rowColor"> +<td class="colLast"><code><strong><a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureShape.html#HSLFPictureShape(org.apache.poi.hslf.usermodel.HSLFPictureData,%20org.apache.poi.sl.usermodel.ShapeContainer)">HSLFPictureShape</a></strong>(<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFPictureData.html" title="class in org.apache.poi.hslf.usermodel">HSLFPictureData</a> data, + <a href="../../../../../../org/apache/poi/sl/usermodel/ShapeContainer.html" title="interface in org.apache.poi.sl.usermodel">ShapeContainer</a><<a href="../../../../../../org/apache/poi/hslf/usermodel/HSLFShape.html" title="class in org.apache.poi.hslf.usermodel">HSLFShape</a>> parent)</code> +<div class="block">Create a new <code>Picture</code></div> +</td> +</tr> </tbody> </table> </li> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
