added HSSFPictureData.getFormat() as requested in #46320

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@730213 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 179b0fdac51522b15edade73e450ef397696b679..62100ceabf110a23143307a4259b8cc70041dc63 100644 (file)
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -37,6 +37,8 @@
 
                <!-- Don't forget to update status.xml too! -->
         <release version="3.5-beta5" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
+           <action dev="POI-DEVELOPERS" type="fix">fixed HSSFSheet.shiftRow to move hyperlinks</action>
            <action dev="POI-DEVELOPERS" type="fix">fixed formula parser to correctly resolve sheet-level names</action>
            <action dev="POI-DEVELOPERS" type="fix">46433 - support for shared formulas in XSSF</action>
            <action dev="POI-DEVELOPERS" type="add">46299 - support for carriage return and line break in XWPFRun</action>

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 245f8a1a3c25513d484d18995ed6e2c099b13d56..1ba3333f2c82219be5ff51c26a0927c2d1021b12 100644 (file)
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,8 @@
        <!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.5-beta5" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="add">46320 - added HSSFPictureData.getFormat()</action>
+           <action dev="POI-DEVELOPERS" type="fix">fixed HSSFSheet.shiftRow to move hyperlinks</action>
            <action dev="POI-DEVELOPERS" type="fix">fixed formula parser to correctly resolve sheet-level names</action>
            <action dev="POI-DEVELOPERS" type="fix">46433 - support for shared formulas in XSSF</action>
            <action dev="POI-DEVELOPERS" type="add">46299 - support for carriage return and line break in XWPFRun</action>

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index 077035055392bef94c3b8bb215b5dcdb82c46bde..81d7c72c62622ee31247c2736210842dbf096115 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
@@ -62,9 +62,23 @@ public class HSSFPictureData implements PictureData
         return blip.getPicturedata();
     }
 
-    /* (non-Javadoc)
-     * @see org.apache.poi.hssf.usermodel.PictureData#suggestFileExtension()
+    /**
+     *
+     * @return format of the picture.
+     * @see HSSFWorkbook#PICTURE_TYPE_DIB
+     * @see HSSFWorkbook#PICTURE_TYPE_WMF
+     * @see HSSFWorkbook#PICTURE_TYPE_EMF
+     * @see HSSFWorkbook#PICTURE_TYPE_PNG
+     * @see HSSFWorkbook#PICTURE_TYPE_JPEG
+     * @see HSSFWorkbook#PICTURE_TYPE_PICT
      */
+    public int getFormat(){
+        return blip.getRecordId() - (short)0xF018;
+    }
+
+    /**
+    * @see #getFormat
+    */
     public String suggestFileExtension()
     {
         switch (blip.getRecordId())

diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
index bac1ad5782e1eba3afe8d2a2519687a04c2fd4ad..4e7d18253f9f791a09508a99d28fcdbc18498075 100644 (file)
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
@@ -55,12 +55,14 @@ public final class TestHSSFPictureData extends TestCase{
                 assertNotNull(jpg);\r
                 assertEquals(192, jpg.getWidth());\r
                 assertEquals(176, jpg.getHeight());\r
+                assertEquals(HSSFWorkbook.PICTURE_TYPE_JPEG, pict.getFormat());\r
             } else if (ext.equals("png")){\r
                 //try to read image data using javax.imageio.* (JDK 1.4+)\r
                 BufferedImage png = ImageIO.read(new ByteArrayInputStream(data));\r
                 assertNotNull(png);\r
                 assertEquals(300, png.getWidth());\r
                 assertEquals(300, png.getHeight());\r
+                assertEquals(HSSFWorkbook.PICTURE_TYPE_PNG, pict.getFormat());\r
             } else {\r
                 //TODO: test code for PICT, WMF and EMF\r
             }\r