You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/10/23 10:49:19 UTC
svn commit: r1894507 - in /poi/trunk:
poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/
poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/
poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/
poi-scratchpad/src/main/java/org/apache/poi/hwpf/us...
Author: fanningpj
Date: Sat Oct 23 10:49:18 2021
New Revision: 1894507
URL: http://svn.apache.org/viewvc?rev=1894507&view=rev
Log:
[bug-65650] use image/x-pict mime type
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java
poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java?rev=1894507&r1=1894506&r2=1894507&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java Sat Oct 23 10:49:18 2021
@@ -97,7 +97,7 @@ public final class ContentTypes {
* @see <a href="http://developer.apple.com/documentation/mac/QuickDraw/QuickDraw-2.html">
* http://developer.apple.com/documentation/mac/QuickDraw/QuickDraw-2.html</a>
*/
- public static final String IMAGE_PICT = "image/pict";
+ public static final String IMAGE_PICT = "image/x-pict";
public static final String EXTENSION_PICT = "pict";
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java?rev=1894507&r1=1894506&r2=1894507&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java Sat Oct 23 10:49:18 2021
@@ -23,8 +23,11 @@ import java.util.Map;
import org.apache.poi.ooxml.POIXMLDocument;
import org.apache.poi.ooxml.POIXMLRelation;
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
+import org.apache.poi.sl.usermodel.PictureData;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import static org.apache.poi.openxml4j.opc.PackageRelationshipTypes.IMAGE_PART;
+
public final class XWPFRelation extends POIXMLRelation {
/**
@@ -155,76 +158,76 @@ public final class XWPFRelation extends
* Supported image formats
*/
public static final XWPFRelation IMAGE_EMF = new XWPFRelation(
- "image/x-emf",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.emf",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.EMF.contentType,
+ IMAGE_PART,
+ "/word/media/image#.emf",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_WMF = new XWPFRelation(
- "image/x-wmf",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.wmf",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.WMF.contentType,
+ IMAGE_PART,
+ "/word/media/image#.wmf",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_PICT = new XWPFRelation(
- "image/pict",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.pict",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.PICT.contentType,
+ IMAGE_PART,
+ "/word/media/image#.pict",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_JPEG = new XWPFRelation(
- "image/jpeg",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.jpeg",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.JPEG.contentType,
+ IMAGE_PART,
+ "/word/media/image#.jpeg",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_PNG = new XWPFRelation(
- "image/png",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.png",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.PNG.contentType,
+ IMAGE_PART,
+ "/word/media/image#.png",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_DIB = new XWPFRelation(
- "image/dib",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.dib",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.DIB.contentType,
+ IMAGE_PART,
+ "/word/media/image#.dib",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_GIF = new XWPFRelation(
- "image/gif",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.gif",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.GIF.contentType,
+ IMAGE_PART,
+ "/word/media/image#.gif",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_TIFF = new XWPFRelation(
- "image/tiff",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.tiff",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.TIFF.contentType,
+ IMAGE_PART,
+ "/word/media/image#.tiff",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_EPS = new XWPFRelation(
- "image/x-eps",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.eps",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.EPS.contentType,
+ IMAGE_PART,
+ "/word/media/image#.eps",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_BMP = new XWPFRelation(
- "image/x-ms-bmp",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.bmp",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.BMP.contentType,
+ IMAGE_PART,
+ "/word/media/image#.bmp",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGE_WPG = new XWPFRelation(
- "image/x-wpg",
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- "/word/media/image#.wpg",
- XWPFPictureData::new, XWPFPictureData::new
+ PictureData.PictureType.WPG.contentType,
+ IMAGE_PART,
+ "/word/media/image#.wpg",
+ XWPFPictureData::new, XWPFPictureData::new
);
public static final XWPFRelation IMAGES = new XWPFRelation(
- null,
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
- null,
- XWPFPictureData::new, XWPFPictureData::new
+ null,
+ IMAGE_PART,
+ null,
+ XWPFPictureData::new, XWPFPictureData::new
);
private XWPFRelation(String type, String rel, String defaultName) {
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java?rev=1894507&r1=1894506&r2=1894507&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java Sat Oct 23 10:49:18 2021
@@ -18,6 +18,7 @@
package org.apache.poi.openxml4j.opc;
import static org.apache.poi.openxml4j.OpenXML4JTestDataSamples.openSampleStream;
+import static org.apache.poi.openxml4j.opc.PackageRelationshipTypes.IMAGE_PART;
import static org.apache.poi.openxml4j.opc.TestContentType.isOldXercesActive;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -316,7 +317,7 @@ class TestRelationships {
assertEquals(6, drawingRels.size());
// expected one image
- assertEquals(1, drawingPart.getRelationshipsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/image").size());
+ assertEquals(1, drawingPart.getRelationshipsByType(IMAGE_PART).size());
// and three hyperlinks
assertEquals(5, drawingPart.getRelationshipsByType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink").size());
Modified: poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java?rev=1894507&r1=1894506&r2=1894507&view=diff
==============================================================================
--- poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java (original)
+++ poi/trunk/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java Sat Oct 23 10:49:18 2021
@@ -29,7 +29,7 @@ public enum PictureType
JPEG( "image/jpeg", "jpg", new byte[][] { { (byte) 0xFF, (byte) 0xD8 } } ),
- PICT( "image/pict", ".pict", new byte[0][] ),
+ PICT( "image/x-pict", ".pict", new byte[0][] ),
PNG( "image/png", "png", new byte[][] { { (byte) 0x89, 0x50, 0x4E, 0x47,
0x0D, 0x0A, 0x1A, 0x0A } } ),
Modified: poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java?rev=1894507&r1=1894506&r2=1894507&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java Sat Oct 23 10:49:18 2021
@@ -30,7 +30,7 @@ public enum PictureType {
/** Windows Meta File */
WMF("image/x-wmf",".wmf"),
/** Mac PICT format */
- PICT("image/pict",".pict"), // or image/x-pict (for HSLF) ???
+ PICT("image/x-pict",".pict"),
/** JPEG format */
JPEG("image/jpeg",".jpg"),
/** PNG format */
Modified: poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java?rev=1894507&r1=1894506&r2=1894507&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java Sat Oct 23 10:49:18 2021
@@ -28,7 +28,7 @@ public interface PictureData {
/** Windows Meta File */
WMF(3,3,"image/x-wmf",".wmf"),
/** Mac PICT format */
- PICT(4,4,"image/pict",".pict"), // or image/x-pict (for HSLF) ???
+ PICT(4,4,"image/x-pict",".pict"),
/** JPEG format */
JPEG(5,5,"image/jpeg",".jpg"),
/** PNG format */
@@ -60,7 +60,7 @@ public interface PictureData {
;
public final int nativeId, ooxmlId;
- public final String contentType,extension;
+ public final String contentType, extension;
PictureType(int nativeId, int ooxmlId,String contentType,String extension) {
this.nativeId = nativeId;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org