Author: nick
Date: Fri May 13 11:06:18 2011
New Revision: 1102668
URL: http://svn.apache.org/viewvc?rev=1102668&view=rev
Log:
Patch from Stefan from bug #51172 - XWPF .gif images support
Modified:
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=1102668&r1=1102667&r2=1102668&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Fri May 13 11:06:18
2011
@@ -34,6 +34,7 @@
<changes>
<release version="3.8-beta3" date="2011-??-??">
+ <action dev="poi-developers" type="add">51172 - Add XWPF support
for GIF pictures</action>
<action dev="poi-developers" type="add">NPOIFS Mini Streams now
support extending the underlying big block stream to fit more data</action>
<action dev="poi-developers" type="fix">51148 - XWPFDocument now
properly tracks paragraphs and tables when adding/removing them</action>
<action dev="poi-developers" type="fix">51153 - Correct sizing of
LbsDataSubRecord with unused padding fields</action>
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java?rev=1102668&r1=1102667&r2=1102668&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java Fri
May 13 11:06:18 2011
@@ -34,5 +34,8 @@ public interface Document {
/** Device independent bitmap */
public static final int PICTURE_TYPE_DIB = 7;
+
+ /** GIF image format */
+ public static final int PICTURE_TYPE_GIF = 8;
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java?rev=1102668&r1=1102667&r2=1102668&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
Fri May 13 11:06:18 2011
@@ -41,13 +41,14 @@ public class XWPFPictureData extends POI
*/
protected static final POIXMLRelation[] RELATIONS;
static {
- RELATIONS = new POIXMLRelation[8];
+ RELATIONS = new POIXMLRelation[9];
RELATIONS[Document.PICTURE_TYPE_EMF] = XWPFRelation.IMAGE_EMF;
RELATIONS[Document.PICTURE_TYPE_WMF] = XWPFRelation.IMAGE_WMF;
RELATIONS[Document.PICTURE_TYPE_PICT] = XWPFRelation.IMAGE_PICT;
RELATIONS[Document.PICTURE_TYPE_JPEG] = XWPFRelation.IMAGE_JPEG;
RELATIONS[Document.PICTURE_TYPE_PNG] = XWPFRelation.IMAGE_PNG;
RELATIONS[Document.PICTURE_TYPE_DIB] = XWPFRelation.IMAGE_DIB;
+ RELATIONS[Document.PICTURE_TYPE_GIF] = XWPFRelation.IMAGE_GIF;
}
/**
* Create a new XWPFGraphicData node
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java?rev=1102668&r1=1102667&r2=1102668&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
Fri May 13 11:06:18 2011
@@ -162,7 +162,12 @@ public final class XWPFRelation extends
"/word/media/image#.dib",
XWPFPictureData.class
);
-
+ public static final XWPFRelation IMAGE_GIF = new XWPFRelation(
+ "image/gif",
+
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";,
+ "/word/media/image#.gif",
+ XWPFPictureData.class
+ );
public static final XWPFRelation IMAGES = new XWPFRelation(
null,
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
