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

fix for bug 44710 - Incorrect skip() of second formula in DATAVALIDATION record

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@643654 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2008-04-01 23:53:51 +00:00
parent e6fb5e7d7b
commit b0825f0e98
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/java/org/apache/poi/hssf/record/DVRecord.java
View File

@ -28,7 +28,7 @@ import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.StringUtil; import org.apache.poi.util.StringUtil;
/** /**
* Title: DV Record<P> * Title: DATAVALIDATION Record (0x01BE)<p/>
* Description: This record stores data validation settings and a list of cell ranges * Description: This record stores data validation settings and a list of cell ranges
* which contain these settings. The data validation settings of a sheet * which contain these settings. The data validation settings of a sheet
* are stored in a sequential list of DV records. This list is followed by * are stored in a sequential list of DV records. This list is followed by
@ -36,7 +36,7 @@ import org.apache.poi.util.StringUtil;
* @author Dragos Buleandra (dragos.buleandra@trade2b.ro) * @author Dragos Buleandra (dragos.buleandra@trade2b.ro)
* @version 2.0-pre * @version 2.0-pre
*/ */
public class DVRecord extends Record public final class DVRecord extends Record
{ {
public final static short sid = 0x01BE; public final static short sid = 0x01BE;
@ -170,11 +170,6 @@ public class DVRecord extends Record
this.field_not_used_1 = in.readShort(); this.field_not_used_1 = in.readShort();
//read first formula data condition //read first formula data condition
// Not sure if this was needed or not...
// try {
// in.skip(this.field_size_first_formula);
// } catch(IOException e) { throw new IllegalStateException(e); }
int token_pos = 0; int token_pos = 0;
while (token_pos < this.field_size_first_formula) while (token_pos < this.field_size_first_formula)
{ {
@ -187,14 +182,14 @@ public class DVRecord extends Record
this.field_not_used_2 = in.readShort(); this.field_not_used_2 = in.readShort();
//read sec formula data condition //read sec formula data condition
//Not sure if this was needed or not... if (false) { // TODO - prior to bug 44710 this 'skip' was being executed. write a junit to confirm this fix
try { try {
in.skip(this.field_size_sec_formula); in.skip(this.field_size_sec_formula);
} catch(IOException e) { } catch(IOException e) {
e.printStackTrace(); e.printStackTrace();
throw new IllegalStateException(e.getMessage()); throw new IllegalStateException(e.getMessage());
}
} }
token_pos = 0; token_pos = 0;
while (token_pos < this.field_size_sec_formula) while (token_pos < this.field_size_sec_formula)
{ {
@ -516,7 +511,7 @@ public class DVRecord extends Record
/**@todo DVRecord = Serializare */ /**@todo DVRecord = Serializare */
private class StringHandler private static final class StringHandler
{ {
private int _string_length = 0x0001; private int _string_length = 0x0001;
private byte _string_unicode_flag = 0x00; private byte _string_unicode_flag = 0x00;