[patch] Replacement Patch with additional bug fix

clonefdiff2.txt (text/plain), 7.86 KB, created by Niall Pemberton on 2003-06-25 22:34:14 UTC

(hide)

Description: Replacement Patch with additional bug fix

Filename:

MIME Type:

Creator: Niall Pemberton

Created: 2003-06-25 22:34:14 UTC

Size: 7.86 KB

patch

obsolete

>Index: ContinueRecord.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/ContinueRecord.java,v >retrieving revision 1.5 >diff -u -r1.5 ContinueRecord.java >--- ContinueRecord.java 30 Apr 2003 04:38:48 -0000 1.5 >+++ ContinueRecord.java 25 Jun 2003 22:18:46 -0000 >@@ -267,4 +267,14 @@ > protected void fillFields(byte [] ignored_parm1, short ignored_parm2, int ignored_parm3) > { > } >+ >+ /** >+ * Clone this record. >+ */ >+ public Object clone() { >+ ContinueRecord clone = new ContinueRecord(); >+ clone.setData(field_1_data); >+ return clone; >+ } >+ > } >Index: FormulaRecord.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/FormulaRecord.java,v >retrieving revision 1.21 >diff -u -r1.21 FormulaRecord.java >--- FormulaRecord.java 2 Jun 2003 02:47:44 -0000 1.21 >+++ FormulaRecord.java 25 Jun 2003 22:18:47 -0000 >@@ -557,8 +557,13 @@ > .append("\n"); > buffer.append(" .xf = ") > .append(Integer.toHexString(getXFIndex())).append("\n"); >- buffer.append(" .value = ").append(getValue()) >- .append("\n"); >+ if (Double.isNaN(this.getValue()) && value_data != null) >+ buffer.append(" .value (NaN) = ") >+ .append(org.apache.poi.util.HexDump.dump(value_data,0,0)) >+ .append("\n"); >+ else >+ buffer.append(" .value = ").append(getValue()) >+ .append("\n"); > buffer.append(" .options = ").append(getOptions()) > .append("\n"); > buffer.append(" .zero = ").append(field_6_zero) >@@ -610,6 +615,7 @@ > Ptg ptg = (Ptg)((Ptg)field_8_parsed_expr.get(i)).clone(); > rec.field_8_parsed_expr.add(i, ptg); > } >+ rec.value_data = value_data; > rec.all_data = all_data; > return rec; > } >Index: PasswordRecord.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/PasswordRecord.java,v >retrieving revision 1.4 >diff -u -r1.4 PasswordRecord.java >--- PasswordRecord.java 30 Apr 2003 04:38:47 -0000 1.4 >+++ PasswordRecord.java 25 Jun 2003 22:18:48 -0000 >@@ -166,4 +166,14 @@ > { > return this.sid; > } >+ >+ /** >+ * Clone this record. >+ */ >+ public Object clone() { >+ PasswordRecord clone = new PasswordRecord(); >+ clone.setPassword(field_1_password); >+ return clone; >+ } >+ > } >cvs server: Diffing aggregates >cvs server: Diffing formula >Index: formula/Area3DPtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java,v >retrieving revision 1.13 >diff -u -r1.13 Area3DPtg.java >--- formula/Area3DPtg.java 30 Apr 2003 04:39:02 -0000 1.13 >+++ formula/Area3DPtg.java 25 Jun 2003 22:18:49 -0000 >@@ -318,6 +318,7 @@ > ptg.field_3_last_row = field_3_last_row; > ptg.field_4_first_column = field_4_first_column; > ptg.field_5_last_column = field_5_last_column; >+ ptg.setClass(ptgClass); > return ptg; > } > >Index: formula/AreaPtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java,v >retrieving revision 1.14 >diff -u -r1.14 AreaPtg.java >--- formula/AreaPtg.java 30 Apr 2003 04:39:02 -0000 1.14 >+++ formula/AreaPtg.java 25 Jun 2003 22:18:50 -0000 >@@ -321,6 +321,7 @@ > ptg.field_2_last_row = field_2_last_row; > ptg.field_3_first_column = field_3_first_column; > ptg.field_4_last_column = field_4_last_column; >+ ptg.setClass(ptgClass); > return ptg; > } > >Index: formula/FuncPtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/FuncPtg.java,v >retrieving revision 1.5 >diff -u -r1.5 FuncPtg.java >--- formula/FuncPtg.java 6 May 2003 15:30:52 -0000 1.5 >+++ formula/FuncPtg.java 25 Jun 2003 22:18:50 -0000 >@@ -63,7 +63,8 @@ > FuncPtg ptg = new FuncPtg(); > //ptg.field_1_num_args = field_1_num_args; > ptg.field_2_fnc_index = field_2_fnc_index; >- return ptg; >+ ptg.setClass(ptgClass); >+ return ptg; > } > > public int getSize() { >Index: formula/FuncVarPtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/FuncVarPtg.java,v >retrieving revision 1.5 >diff -u -r1.5 FuncVarPtg.java >--- formula/FuncVarPtg.java 6 May 2003 15:30:52 -0000 1.5 >+++ formula/FuncVarPtg.java 25 Jun 2003 22:18:50 -0000 >@@ -52,6 +52,7 @@ > FuncVarPtg ptg = new FuncVarPtg(); > ptg.field_1_num_args = field_1_num_args; > ptg.field_2_fnc_index = field_2_fnc_index; >+ ptg.setClass(ptgClass); > return ptg; > } > >Index: formula/NamePtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/NamePtg.java,v >retrieving revision 1.6 >diff -u -r1.6 NamePtg.java >--- formula/NamePtg.java 30 Apr 2003 04:39:02 -0000 1.6 >+++ formula/NamePtg.java 25 Jun 2003 22:18:50 -0000 >@@ -121,6 +121,7 @@ > ptg.field_1_ixti = field_1_ixti; > ptg.field_2_label_index = field_2_label_index; > ptg.field_3_zero = field_3_zero; >+ ptg.setClass(ptgClass); > return ptg; > } > } >Index: formula/NameXPtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java,v >retrieving revision 1.1 >diff -u -r1.1 NameXPtg.java >--- formula/NameXPtg.java 5 May 2003 15:33:14 -0000 1.1 >+++ formula/NameXPtg.java 25 Jun 2003 22:18:51 -0000 >@@ -102,7 +102,7 @@ > > public void writeBytes(byte [] array, int offset) > { >- array[ offset + 0 ] = sid; >+ array[ offset + 0 ] = (byte)(sid + ptgClass); > LittleEndian.putShort(array, offset + 1, field_1_ixals); > LittleEndian.putShort(array,offset+3, field_2_ilbl); > LittleEndian.putShort(array, offset + 5, field_3_reserved); >@@ -125,6 +125,7 @@ > ptg.field_1_ixals = field_1_ixals; > ptg.field_3_reserved = field_3_reserved; > ptg.field_2_ilbl = field_2_ilbl; >+ ptg.setClass(ptgClass); > return ptg; > } > } >Index: formula/Ref3DPtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java,v >retrieving revision 1.10 >diff -u -r1.10 Ref3DPtg.java >--- formula/Ref3DPtg.java 30 Apr 2003 04:39:02 -0000 1.10 >+++ formula/Ref3DPtg.java 25 Jun 2003 22:18:51 -0000 >@@ -210,6 +210,7 @@ > ptg.field_1_index_extern_sheet = field_1_index_extern_sheet; > ptg.field_2_row = field_2_row; > ptg.field_3_column = field_3_column; >+ ptg.setClass(ptgClass); > return ptg; > } > >Index: formula/ReferencePtg.java >=================================================================== >RCS file: /home/cvspublic/jakarta-poi/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java,v >retrieving revision 1.8 >diff -u -r1.8 ReferencePtg.java >--- formula/ReferencePtg.java 30 Apr 2003 04:39:02 -0000 1.8 >+++ formula/ReferencePtg.java 25 Jun 2003 22:18:52 -0000 >@@ -193,6 +193,7 @@ > ReferencePtg ptg = new ReferencePtg(); > ptg.field_1_row = field_1_row; > ptg.field_2_col = field_2_col; >+ ptg.setClass(ptgClass); > return ptg; > } > } > > View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]