You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by jo...@apache.org on 2008/11/29 03:07:50 UTC
svn commit: r721614 -
/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
Author: josh
Date: Fri Nov 28 18:07:49 2008
New Revision: 721614
URL: http://svn.apache.org/viewvc?rev=721614&view=rev
Log:
Simplified logic in getStyleRecord() (investigating bug 46259)
Modified:
poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java?rev=721614&r1=721613&r2=721614&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/Workbook.java Fri Nov 28 18:07:49 2008
@@ -72,6 +72,7 @@
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 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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org