Simplified logic in getStyleRecord() (investigating bug 46259)

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

diff --git a/src/java/org/apache/poi/hssf/model/Workbook.java b/src/java/org/apache/poi/hssf/model/Workbook.java
index 76854518f89b13f3f4c9e007f867a7aae2882558..765dc1afd305ba8a53d90d56587339059d6d6476 100644 (file)
--- a/src/java/org/apache/poi/hssf/model/Workbook.java
+++ b/src/java/org/apache/poi/hssf/model/Workbook.java
@@ -72,6 +72,7 @@ import org.apache.poi.hssf.record.StyleRecord;
 import org.apache.poi.hssf.record.SupBookRecord;
 import org.apache.poi.hssf.record.TabIdRecord;
 import org.apache.poi.hssf.record.UnicodeString;
+import org.apache.poi.hssf.record.UnknownRecord;
 import org.apache.poi.hssf.record.UseSelFSRecord;
 import org.apache.poi.hssf.record.WindowOneRecord;
 import org.apache.poi.hssf.record.WindowProtectRecord;
@@ -824,18 +825,17 @@ public final class Workbook implements Model {
     public StyleRecord getStyleRecord(int xfIndex) {
         // Style records always follow after 
         //  the ExtendedFormat records
-        boolean done = false;
-        for(int i=records.getXfpos(); i<records.size() &&
-                !done; i++) {
+        for(int i=records.getXfpos(); i<records.size(); i++) {
             Record r = records.get(i);
             if(r instanceof ExtendedFormatRecord) {
-            } else if(r instanceof StyleRecord) {
-                StyleRecord sr = (StyleRecord)r;
-                if(sr.getXFIndex() == xfIndex) {
-                    return sr;
-                }
-            } else {
-                done = true;
+                continue;
+            }
+            if(!(r instanceof StyleRecord)) {
+                return null;
+            }
+            StyleRecord sr = (StyleRecord)r;
+            if(sr.getXFIndex() == xfIndex) {
+                return sr;
             }
         }
         return null;