Author: yegor
Date: Wed Oct 20 16:38:06 2010
New Revision: 1025635
URL: http://svn.apache.org/viewvc?rev=1025635&view=rev
Log:
avoid nulls in HSSFWorkbook.getAllPictures when EscherBlipRecord is not found
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1025635&r1=1025634&r2=1025635&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Wed Oct
20 16:38:06 2010
@@ -1594,8 +1594,6 @@ public final class HSSFWorkbook extends
// TODO: Some kind of structure.
HSSFPictureData picture = new HSSFPictureData(blip);
pictures.add(picture);
- } else {
- pictures.add(null);
}
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java?rev=1025635&r1=1025634&r2=1025635&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
Wed Oct 20 16:38:06 2010
@@ -71,4 +71,16 @@ public final class TestHSSFPictureData e
}
}
}
+
+ public void testNotNullPictures() throws IOException {
+
+ HSSFWorkbook wb =
HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls");
+
+ @SuppressWarnings("unchecked") // TODO - add getFormat() to interface
PictureData and genericise wb.getAllPictures()
+ List<HSSFPictureData> lst =
(List<HSSFPictureData>)(List<?>)wb.getAllPictures();
+ for(HSSFPictureData pict : lst){
+ assertNotNull(pict);
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
