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/09/19 00:13:02 UTC
svn commit: r696831 - in /poi/branches/ooxml: ./
src/java/org/apache/poi/hssf/model/ src/java/org/apache/poi/hssf/record/
src/java/org/apache/poi/hssf/record/formula/
src/java/org/apache/poi/hssf/record/formula/functions/
src/java/org/apache/poi/hssf/u...
Author: josh
Date: Thu Sep 18 15:13:01 2008
New Revision: 696831
URL: http://svn.apache.org/viewvc?rev=696831&view=rev
Log:
Merged revisions 696501 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk
........
r696501 | josh | 2008-09-17 15:35:09 -0700 (Wed, 17 Sep 2008) | 1 line
Small tweak to NamePtg and Ref3DPtg
........
Modified:
poi/branches/ooxml/ (props changed)
poi/branches/ooxml/src/java/org/apache/poi/hssf/model/FormulaParser.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/functions/DateFunc.java (props changed)
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/LazyAreaEval.java (props changed)
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/LazyRefEval.java (props changed)
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 15:13:01 2008
@@ -1 +1 @@
-/poi/trunk:693591-694881,695264-695420,695621,695649-696111
+/poi/trunk:693591-694881,695264-695420,695621,695649-696111,696501
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 18 15:13:01 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-696111
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-650914,650916-696111,696501
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/model/FormulaParser.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/model/FormulaParser.java?rev=696831&r1=696830&r2=696831&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/model/FormulaParser.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/model/FormulaParser.java Thu Sep 18 15:13:01 2008
@@ -319,7 +319,7 @@
for(int i = 0; i < book.getNumberOfNames(); i++) {
// named range name matching is case insensitive
if(book.getNameAt(i).getNameName().equalsIgnoreCase(name)) {
- return new NamePtg(name, book);
+ return new NamePtg(i);
}
}
throw new FormulaParseException("Specified named range '"
@@ -388,7 +388,7 @@
// calls to user-defined functions within the workbook
// get a Name token which points to a defined name record
- nameToken = new NamePtg(name, this.book);
+ nameToken = new NamePtg(nameIndex);
} else {
if(book instanceof HSSFWorkbook) {
nameToken = ((HSSFWorkbook)book).getNameXPtg(name);
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java?rev=696831&r1=696830&r2=696831&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java Thu Sep 18 15:13:01 2008
@@ -447,7 +447,7 @@
/** gets the extern sheet number
* @return extern sheet index
*/
- public short getExternSheetNumber(){
+ public int getExternSheetNumber(){
if (field_13_name_definition.length < 1) {
return 0;
}
@@ -513,7 +513,7 @@
oldPtg = field_13_name_definition[0];
}
List temp = new ArrayList();
- short externSheetIndex = 0;
+ int externSheetIndex = 0;
if (oldPtg.getClass() == Area3DPtg.class){
externSheetIndex = ((Area3DPtg) oldPtg).getExternSheetIndex();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NamePtg.java?rev=696831&r1=696830&r2=696831&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NamePtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NamePtg.java Thu Sep 18 15:13:01 2008
@@ -18,7 +18,6 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.ss.usermodel.Name;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.util.LittleEndian;
@@ -31,33 +30,14 @@
public final static short sid = 0x23;
private final static int SIZE = 5;
/** one-based index to defined name record */
- private short field_1_label_index;
+ private int field_1_label_index;
private short field_2_zero; // reserved must be 0
/**
- * Creates new NamePtg and sets its name index to that of the corresponding defined name record
- * in the workbook. The search for the name record is case insensitive. If it is not found,
- * it gets created.
+ * @param nameIndex zero-based index to name within workbook
*/
- public NamePtg(String name, Workbook book) {
- field_1_label_index = (short)(1+getOrCreateNameRecord(book, name)); // convert to 1-based
- }
- /**
- * @return zero based index of the found or newly created defined name record.
- */
- private static final int getOrCreateNameRecord(Workbook book, String name) {
- // perhaps this logic belongs in Workbook?
- int countNames = book.getNumberOfNames();
- for (int i = 0; i < countNames; i++) {
- if(name.equalsIgnoreCase( book.getNameName(i) )) {
- return i;
- }
- }
-
- Name nameObj = book.createName();
- nameObj.setNameName(name);
-
- return countNames;
+ public NamePtg(int nameIndex) {
+ field_1_label_index = 1+nameIndex; // convert to 1-based
}
/** Creates new NamePtg */
@@ -75,9 +55,9 @@
}
public void writeBytes(byte [] array, int offset) {
- array[offset+0]= (byte) (sid + getPtgClass());
- LittleEndian.putShort(array,offset+1,field_1_label_index);
- LittleEndian.putShort(array,offset+3, field_2_zero);
+ LittleEndian.putByte(array, offset + 0, sid + getPtgClass());
+ LittleEndian.putUShort(array, offset + 1, field_1_label_index);
+ LittleEndian.putUShort(array, offset + 3, field_2_zero);
}
public int getSize() {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java?rev=696831&r1=696830&r2=696831&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java Thu Sep 18 15:13:01 2008
@@ -44,7 +44,7 @@
readCoordinates(in);
}
- public Ref3DPtg(String cellref, short externIdx ) {
+ public Ref3DPtg(String cellref, int externIdx ) {
CellReference c= new CellReference(cellref);
setRow(c.getRow());
setColumn(c.getCol());
@@ -65,17 +65,17 @@
}
public void writeBytes(byte [] array, int offset) {
- array[ 0 + offset ] = (byte) (sid + getPtgClass());
- LittleEndian.putShort(array, 1 + offset , getExternSheetIndex());
- writeCoordinates(array, offset+3);
+ LittleEndian.putByte(array, 0 + offset, sid + getPtgClass());
+ LittleEndian.putUShort(array, 1 + offset, getExternSheetIndex());
+ writeCoordinates(array, offset + 3);
}
public int getSize() {
return SIZE;
}
- public short getExternSheetIndex(){
- return (short)field_1_index_extern_sheet;
+ public int getExternSheetIndex(){
+ return field_1_index_extern_sheet;
}
public void setExternSheetIndex(int index){
Propchange: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/functions/DateFunc.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 15:13:01 2008
@@ -1 +1 @@
-/poi/trunk/src/java/org/apache/poi/hssf/record/formula/functions/DateFunc.java:695264-695420,695621,695649,696038,696075-696084,696109-696111
+/poi/trunk/src/java/org/apache/poi/hssf/record/formula/functions/DateFunc.java:695264-695420,695621,695649-696501
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFName.java?rev=696831&r1=696830&r2=696831&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFName.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFName.java Thu Sep 18 15:13:01 2008
@@ -48,7 +48,7 @@
* @return sheet name, which this named range referred to
*/
public String getSheetName() {
- short indexToExternSheet = _definedNameRec.getExternSheetNumber();
+ int indexToExternSheet = _definedNameRec.getExternSheetNumber();
return _book.getWorkbook().findSheetNameFromExternSheet(indexToExternSheet);
}
Propchange: poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/LazyAreaEval.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 15:13:01 2008
@@ -1 +1 @@
-/poi/trunk/src/java/org/apache/poi/hssf/usermodel/LazyAreaEval.java:695264-695420,695621,695649,696038,696075-696084,696109-696111
+/poi/trunk/src/java/org/apache/poi/hssf/usermodel/LazyAreaEval.java:695264-695420,695621,695649-696501
Propchange: poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/LazyRefEval.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 18 15:13:01 2008
@@ -1 +1 @@
-/poi/trunk/src/java/org/apache/poi/hssf/usermodel/LazyRefEval.java:695264-695420,695621,695649,696038,696075-696084,696109-696111
+/poi/trunk/src/java/org/apache/poi/hssf/usermodel/LazyRefEval.java:695264-695420,695621,695649-696501
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org