Make picture loading in HWPF PicturesTable easier to understand
The recursion is no longer necessary due to the more defined structure of OfficeArtContent.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887016 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
index 59a6159..2ea08f5 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
@@ -117,10 +117,6 @@
assert pos == offset + size;
}
- public List<EscherRecord> getEscherRecords() {
- return drawingGroupData.getChildRecords();
- }
-
private List<? extends EscherContainerRecord> getDgContainers() {
List<EscherContainerRecord> dgContainers = new ArrayList<>(2);
if (mainDocumentDgContainer != null) {
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
index b74c155..e01f6ff 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
@@ -26,6 +26,7 @@
import org.apache.poi.ddf.DefaultEscherRecordFactory;
import org.apache.poi.ddf.EscherBSERecord;
import org.apache.poi.ddf.EscherBlipRecord;
+import org.apache.poi.ddf.EscherContainerRecord;
import org.apache.poi.ddf.EscherRecord;
import org.apache.poi.ddf.EscherRecordFactory;
import org.apache.poi.hwpf.HWPFDocument;
@@ -166,7 +167,7 @@
}
/**
- * Performs a recursive search for pictures in the given list of escher records.
+ * Performs a search for pictures in the given list of escher records.
*
* @param escherRecords the escher records.
* @param pictures the list to populate with the pictures.
@@ -205,9 +206,6 @@
}
}
}
-
- // Recursive call.
- searchForPictures(escherRecord.getChildRecords(), pictures);
}
}
@@ -234,9 +232,12 @@
}
}
- searchForPictures(_dgg.getEscherRecords(), pictures);
+ EscherContainerRecord bStore = _dgg.getBStoreContainer();
+ if (bStore != null) {
+ searchForPictures(bStore.getChildRecords(), pictures);
+ }
- return pictures;
+ return pictures;
}
private boolean isBlockContainsImage(int i)
