{
public final static int SIZE = 3;
public final static byte sid = 0x1e;
- private short field_1_value;
+ private int field_1_value;
private IntPtg() {
//Required for clone methods
public IntPtg(RecordInputStream in)
{
- setValue(in.readShort());
+ setValue(in.readUShort());
}
// IntPtg should be able to create itself, shouldnt have to call setValue
public IntPtg(String formulaToken) {
- setValue(Short.parseShort(formulaToken));
+ setValue(Integer.parseInt(formulaToken));
}
/**
* Sets the wrapped value.
* Normally you should call with a positive int.
*/
- public void setValue(short value)
- {
- field_1_value = value;
- }
-
- /**
- * Sets the unsigned value.
- * (Handles conversion to the internal short value)
- */
public void setValue(int value)
{
- if(value > Short.MAX_VALUE) {
- // Need to wrap
- value -= (Short.MAX_VALUE+1)*2;
- }
- field_1_value = (short)value;
+ if(value < 0 || value > (Short.MAX_VALUE + 1)*2 )
+ throw new IllegalArgumentException("Unsigned short is out of range: " + value);
+ field_1_value = value;
}
/**
* Returns the value as a short, which may have
* been wrapped into negative numbers
*/
- public short getValue()
+ public int getValue()
{
return field_1_value;
}
public void writeBytes(byte [] array, int offset)
{
array[ offset + 0 ] = sid;
- LittleEndian.putShort(array, offset + 1, getValue());
+ LittleEndian.putUShort(array, offset + 1, getValue());
}
public int getSize()
--- /dev/null
+package org.apache.poi.hssf.usermodel;\r
+/* ====================================================================\r
+ Licensed to the Apache Software Foundation (ASF) under one or more\r
+ contributor license agreements. See the NOTICE file distributed with\r
+ this work for additional information regarding copyright ownership.\r
+ The ASF licenses this file to You under the Apache License, Version 2.0\r
+ (the "License"); you may not use this file except in compliance with\r
+ the License. You may obtain a copy of the License at\r
+\r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ See the License for the specific language governing permissions and\r
+ limitations under the License.\r
+==================================================================== */\r
+\r
+import junit.framework.TestCase;\r
+\r
+import java.io.IOException;\r
+import java.io.FileInputStream;\r
+import java.io.File;\r
+\r
+/**\r
+ * Bug 44297: 32767+32768 is evaluated to -1\r
+ * Fix: IntPtg must operate with unsigned short. Reading signed short results in incorrect formula calculation\r
+ * if a formula has values in the interval [Short.MAX_VALUE, (Short.MAX_VALUE+1)*2]\r
+ *\r
+ * @author Yegor Kozlov\r
+ */\r
+\r
+public class TestBug44297 extends TestCase {\r
+ protected String cwd = System.getProperty("HSSF.testdata.path");\r
+\r
+ public void test44297() throws IOException {\r
+ FileInputStream in = new FileInputStream(new File(cwd, "44297.xls"));\r
+ HSSFWorkbook wb = new HSSFWorkbook(in);\r
+ in.close();\r
+\r
+ HSSFRow row;\r
+ HSSFCell cell;\r
+\r
+ HSSFSheet sheet = wb.getSheetAt(0);\r
+\r
+ HSSFFormulaEvaluator eva = new HSSFFormulaEvaluator(sheet, wb);\r
+\r
+ row = (HSSFRow)sheet.getRow(0);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("31+46", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(77, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(1);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("30+53", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(83, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(2);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("SUM(A1:A2)", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(160, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(4);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("32767+32768", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(65535, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(7);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("32744+42333", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(75077, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(8);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("327680.0/32768", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(10, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(9);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("32767+32769", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(65536, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(10);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("35000+36000", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(71000, eva.evaluate(cell).getNumberValue(), 0);\r
+\r
+ row = (HSSFRow)sheet.getRow(11);\r
+ cell = row.getCell((short)0);\r
+ assertEquals("-1000000.0-3000000.0", cell.getCellFormula());\r
+ eva.setCurrentRow(row);\r
+ assertEquals(-4000000, eva.evaluate(cell).getNumberValue(), 0);\r
+ }\r
+\r
+}\r
projects / poi.git / commitdiff