Return a list of all pictures for a workbook. This shows a discrepancy between the way pictures are stored in OLE2 files and the way they are stored in OOXML files. In the former case, pictures are associated with the workbook, in the latter they are referred to in "drawings" which are, in turn, referred to in sheets.

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

1 files changed, 6 insertions, 10 deletions

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index 439100a53a..8607e5cf7b 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
@@ -17,15 +17,15 @@
 
 package org.apache.poi.hssf.usermodel;
 
-import org.apache.poi.ddf.EscherBitmapBlip;
 import org.apache.poi.ddf.EscherBlipRecord;
+import org.apache.poi.ss.usermodel.PictureData;
 
 /**
  * Represents binary data stored in the file.  Eg. A GIF, JPEG etc...
  *
  * @author Daniel Noll
  */
-public class HSSFPictureData
+public class HSSFPictureData implements PictureData
 {
     // MSOBI constants for various formats.
     public static final short MSOBI_WMF   = 0x2160;
@@ -52,20 +52,16 @@ public class HSSFPictureData
         this.blip = blip;
     }
 
-    /**
-     * Gets the picture data.
-     *
-     * @return the picture data.
+    /* (non-Javadoc)
+     * @see org.apache.poi.hssf.usermodel.PictureData#getData()
      */
     public byte[] getData()
     {
         return blip.getPicturedata();
     }
 
-    /**
-     * Suggests a file extension for this image.
-     *
-     * @return the file extension.
+    /* (non-Javadoc)
+     * @see org.apache.poi.hssf.usermodel.PictureData#suggestFileExtension()
      */
     public String suggestFileExtension()
     {