From 69cfa15160cf945c95a4ccbdab7abbf113015ee4 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Wed, 20 Oct 2010 16:38:06 +0000 Subject: [PATCH] avoid nulls in HSSFWorkbook.getAllPictures when EscherBlipRecord is not found git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1025635 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hssf/usermodel/HSSFWorkbook.java | 2 -- .../poi/hssf/usermodel/TestHSSFPictureData.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java index 24999fe203..7cedfecacd 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java @@ -1594,8 +1594,6 @@ public final class HSSFWorkbook extends POIDocument implements org.apache.poi.ss // TODO: Some kind of structure. HSSFPictureData picture = new HSSFPictureData(blip); pictures.add(picture); - } else { - pictures.add(null); } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java index e351e26690..99f4ad8068 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java @@ -71,4 +71,16 @@ public final class TestHSSFPictureData extends TestCase{ } } } + + public void testNotNullPictures() throws IOException { + + HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls"); + + @SuppressWarnings("unchecked") // TODO - add getFormat() to interface PictureData and genericise wb.getAllPictures() + List lst = (List)(List)wb.getAllPictures(); + for(HSSFPictureData pict : lst){ + assertNotNull(pict); + } + } + } -- 2.39.5