From: Maxim Valyanskiy <maxcom@apache.org>
Date: Wed, 20 Jan 2010 14:33:58 +0000 (+0000)
Subject: PowerPoint OLEShape: extract last version of embedded ole object
X-Git-Tag: REL_3_7_BETA1~123
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3f0d9084f84b16e2f222893a4a5385cc0c5e52fc;p=poi.git

PowerPoint OLEShape: extract last version of embedded ole object

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

diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java b/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
index 161a332b34..b6b4db6734 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/OLEShape.java
@@ -84,12 +84,20 @@ public final class OLEShape extends Picture {
 
         //persist reference
         int ref = getExEmbed().getExOleObjAtom().getObjStgDataRef();
+
+        ObjectData data = null;
+
         for (int i = 0; i < ole.length; i++) {
-            if(ole[i].getExOleObjStg().getPersistId() == ref) return ole[i];
+            if(ole[i].getExOleObjStg().getPersistId() == ref) {
+                data=ole[i];
+            }
+        }
 
+        if (data==null) {
+            logger.log(POILogger.WARN, "OLE data not found");
         }
-        logger.log(POILogger.WARN, "OLE data not found");
-        return null;
+
+        return data;
     }
 
     /**