moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

hwpf: Ignore null argument in PicturesTable.hasPicture

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1037670 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maxim Valyanskiy 2010-11-22 11:10:01 +00:00
parent e994534f3e
commit 1c64221e5a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
View File

@ -87,6 +87,10 @@ public final class PicturesTable
* @param run * @param run
*/ */
public boolean hasPicture(CharacterRun run) { public boolean hasPicture(CharacterRun run) {
if (run==null) {
return false;
}
if (run.isSpecialCharacter() && !run.isObj() && !run.isOle2() && !run.isData()) { if (run.isSpecialCharacter() && !run.isObj() && !run.isOle2() && !run.isData()) {
// Image should be in it's own run, or in a run with the end-of-special marker // Image should be in it's own run, or in a run with the end-of-special marker
if("\u0001".equals(run.text()) || "\u0001\u0015".equals(run.text())) { if("\u0001".equals(run.text()) || "\u0001\u0015".equals(run.text())) {