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 09:46:13 UTC
svn commit: r1894506 -
/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
Author: fanningpj
Date: Sat Oct 23 09:46:13 2021
New Revision: 1894506
URL: http://svn.apache.org/viewvc?rev=1894506&view=rev
Log:
use content types from constants
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java?rev=1894506&r1=1894505&r2=1894506&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java Sat Oct 23 09:46:13 2021
@@ -22,6 +22,7 @@ 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.model.CalculationChain;
import org.apache.poi.xssf.model.CommentsTable;
import org.apache.poi.xssf.model.ExternalLinksTable;
@@ -150,87 +151,94 @@ public final class XSSFRelation extends
);
public static final XSSFRelation IMAGES = new XSSFRelation(
- null,
- PackageRelationshipTypes.IMAGE_PART,
- null,
- XSSFPictureData::new, XSSFPictureData::new
+ null,
+ PackageRelationshipTypes.IMAGE_PART,
+ null,
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_EMF = new XSSFRelation(
- "image/x-emf",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.emf",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.EMF.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.emf",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_WMF = new XSSFRelation(
- "image/x-wmf",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.wmf",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.WMF.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.wmf",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_PICT = new XSSFRelation(
- "image/pict",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.pict",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.PICT.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.pict",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_JPEG = new XSSFRelation(
- "image/jpeg",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.jpeg",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.JPEG.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.jpeg",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_PNG = new XSSFRelation(
- "image/png",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.png",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.PNG.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.png",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_DIB = new XSSFRelation(
- "image/dib",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.dib",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.DIB.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.dib",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_GIF = new XSSFRelation(
- "image/gif",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.gif",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.GIF.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.gif",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_TIFF = new XSSFRelation(
- "image/tiff",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.tiff",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.TIFF.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.tiff",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_EPS = new XSSFRelation(
- "image/x-eps",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.eps",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.EPS.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.eps",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_BMP = new XSSFRelation(
- "image/x-ms-bmp",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.bmp",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.BMP.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.bmp",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation IMAGE_WPG = new XSSFRelation(
- "image/x-wpg",
- PackageRelationshipTypes.IMAGE_PART,
- "/xl/media/image#.wpg",
- XSSFPictureData::new, XSSFPictureData::new
+ PictureData.PictureType.WPG.contentType,
+ PackageRelationshipTypes.IMAGE_PART,
+ "/xl/media/image#.wpg",
+ XSSFPictureData::new, XSSFPictureData::new
+ );
+
+ public static final XSSFRelation HDPHOTO_WDP = new XSSFRelation(
+ PictureData.PictureType.WDP.contentType,
+ PackageRelationshipTypes.HDPHOTO_PART,
+ "/xl/media/hdphoto#.wdp",
+ XSSFPictureData::new, XSSFPictureData::new
);
public static final XSSFRelation SHEET_COMMENTS = new XSSFRelation(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org