Index: src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
===================================================================
--- src/java/org/apache/poi/hssf/model/WorkbookRecordList.java	(revision 1100785)
+++ src/java/org/apache/poi/hssf/model/WorkbookRecordList.java	(working copy)
@@ -22,9 +22,11 @@
 import java.util.List;
 
 import org.apache.poi.hssf.record.Record;
+import org.apache.poi.hssf.record.StyleRecord;
 
 public final class WorkbookRecordList implements Iterable<Record> {
     private List<Record> records = new ArrayList<Record>();
+    private List<StyleRecord> styleRecords = new ArrayList<StyleRecord>();
 
 	private int  protpos	 = 0;   // holds the position of the protect record.
 	private int  bspos	   = 0;   // holds the position of the last bound sheet.
@@ -40,8 +42,18 @@
 
 	public void setRecords(List<Record> records) {
 		this.records = records;
+        styleRecords.clear();
+        for(Record r: records) {
+            if(r instanceof StyleRecord) {
+                styleRecords.add((StyleRecord)r);
+            }
+        }
 	}
 
+    public List<StyleRecord> getStyleRecords() {
+        return styleRecords;
+    }
+
 	public int size() {
 		return records.size();
 	}
@@ -52,6 +64,9 @@
 
 	public void add(int pos, Record r) {
 		records.add(pos, r);
+        if(r instanceof StyleRecord) {
+            styleRecords.add((StyleRecord)r);
+        }
 		if (getProtpos() >= pos) setProtpos( protpos + 1 );
 		if (getBspos() >= pos) setBspos( bspos + 1 );
 		if (getTabpos() >= pos) setTabpos( tabpos + 1 );
@@ -79,7 +94,8 @@
 
 	public void remove( int pos )
 	{
-		records.remove(pos);
+		Record r = records.remove(pos);
+        styleRecords.remove(r);
 		if (getProtpos() >= pos) setProtpos( protpos - 1 );
 		if (getBspos() >= pos) setBspos( bspos - 1 );
 		if (getTabpos() >= pos) setTabpos( tabpos - 1 );
Index: src/java/org/apache/poi/hssf/model/InternalWorkbook.java
===================================================================
--- src/java/org/apache/poi/hssf/model/InternalWorkbook.java	(revision 1100785)
+++ src/java/org/apache/poi/hssf/model/InternalWorkbook.java	(working copy)
@@ -867,15 +867,7 @@
     public StyleRecord getStyleRecord(int xfIndex) {
         // Style records always follow after
         //  the ExtendedFormat records
-        for(int i=records.getXfpos(); i<records.size(); i++) {
-            Record r = records.get(i);
-            if(r instanceof ExtendedFormatRecord) {
-                continue;
-            }
-            if(!(r instanceof StyleRecord)) {
-                continue;
-            }
-            StyleRecord sr = (StyleRecord)r;
+        for(StyleRecord sr: records.getStyleRecords()) {
             if(sr.getXFIndex() == xfIndex) {
                 return sr;
             }