You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2010/09/10 21:15:17 UTC
svn commit: r995943 - in /poi/trunk/src:
java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
Author: nick
Date: Fri Sep 10 19:15:16 2010
New Revision: 995943
URL: http://svn.apache.org/viewvc?rev=995943&view=rev
Log:
Tweak hssf and hwpf image mime types for wmf/emf to match those used by XSSF/XWPF
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java?rev=995943&r1=995942&r2=995943&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java Fri Sep 10 19:15:16 2010
@@ -106,9 +106,9 @@ public class HSSFPictureData implements
public String getMimeType() {
switch (blip.getRecordId()) {
case EscherMetafileBlip.RECORD_ID_WMF:
- return "application/x-wmf";
+ return "image/x-wmf";
case EscherMetafileBlip.RECORD_ID_EMF:
- return "application/x-emf";
+ return "image/x-emf";
case EscherMetafileBlip.RECORD_ID_PICT:
return "image/x-pict";
case EscherBitmapBlip.RECORD_ID_PNG:
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java?rev=995943&r1=995942&r2=995943&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java Fri Sep 10 19:15:16 2010
@@ -236,10 +236,10 @@ public final class Picture
return "image/tiff";
}
if("wmf".equals(extension)) {
- return "application/x-wmf";
+ return "image/x-wmf";
}
if("emf".equals(extension)) {
- return "application/x-emf";
+ return "image/x-emf";
}
return "image/unknown";
}
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java?rev=995943&r1=995942&r2=995943&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java Fri Sep 10 19:15:16 2010
@@ -79,7 +79,7 @@ public final class TestPictures extends
assertEquals("png", pics.get(4).suggestFileExtension());
assertEquals("image/png", pics.get(4).getMimeType());
assertEquals("wmf", pics.get(5).suggestFileExtension());
- assertEquals("application/x-wmf", pics.get(5).getMimeType());
+ assertEquals("image/x-wmf", pics.get(5).getMimeType());
assertEquals("jpg", pics.get(6).suggestFileExtension());
assertEquals("image/jpeg", pics.get(6).getMimeType());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org