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

Simplified logic in getStyleRecord() (investigating bug 46259)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@721614 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2008-11-29 02:07:49 +00:00
parent 2b6a9c351e
commit 5f3c3d71a3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/org/apache/poi/hssf/model/Workbook.java
View File

@ -72,6 +72,7 @@ import org.apache.poi.hssf.record.StyleRecord;
import org.apache.poi.hssf.record.SupBookRecord; import org.apache.poi.hssf.record.SupBookRecord;
import org.apache.poi.hssf.record.TabIdRecord; import org.apache.poi.hssf.record.TabIdRecord;
import org.apache.poi.hssf.record.UnicodeString; 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.UseSelFSRecord;
import org.apache.poi.hssf.record.WindowOneRecord; import org.apache.poi.hssf.record.WindowOneRecord;
import org.apache.poi.hssf.record.WindowProtectRecord; import org.apache.poi.hssf.record.WindowProtectRecord;
@ -824,19 +825,18 @@ public final class Workbook implements Model {
public StyleRecord getStyleRecord(int xfIndex) { public StyleRecord getStyleRecord(int xfIndex) {
// Style records always follow after // Style records always follow after
// the ExtendedFormat records // the ExtendedFormat records
boolean done = false; for(int i=records.getXfpos(); i<records.size(); i++) {
for(int i=records.getXfpos(); i<records.size() &&
!done; i++) {
Record r = records.get(i); Record r = records.get(i);
if(r instanceof ExtendedFormatRecord) { if(r instanceof ExtendedFormatRecord) {
} else if(r instanceof StyleRecord) { continue;
}
if(!(r instanceof StyleRecord)) {
return null;
}
StyleRecord sr = (StyleRecord)r; StyleRecord sr = (StyleRecord)r;
if(sr.getXFIndex() == xfIndex) { if(sr.getXFIndex() == xfIndex) {
return sr; return sr;
} }
} else {
done = true;
}
} }
return null; return null;
} }