Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverted initial application of patches 47848(r815935) and 47849(r815942). Some details need clarification. 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@816006 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2009-09-16 23:20:51 +00:00
parent 513f87c213
commit a82e264754
7 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/documentation/content/xdocs/status.xml
View File

@ -33,8 +33,6 @@
<changes>
<release version="3.5-beta7" date="2009-??-??">
<action dev="POI-DEVELOPERS" type="add">47849 - Added possibility to get EvaluationCell from RefEval</action>
<action dev="POI-DEVELOPERS" type="add">47848 - Added method createEvaluationWorkbook() to CreationHelper</action>
<action dev="POI-DEVELOPERS" type="add">47809 - Improved work with user-defined functions</action>
<action dev="POI-DEVELOPERS" type="fix">47581 - fixed XSSFSheet.setColumnWidth to produce XML compatible with Mac Excel 2008</action>
<action dev="POI-DEVELOPERS" type="fix">47734 - removed unnecessary svn:executable flag from files in SVN trunk</action>

9
src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
View File

@ -17,8 +17,6 @@
package org.apache.poi.hssf.record.formula.eval;
import org.apache.poi.ss.formula.EvaluationCell;
/**
* @author Amol S Deshmukh &lt; amolweb at ya hoo dot com &gt;
*
@ -28,8 +26,6 @@ import org.apache.poi.ss.formula.EvaluationCell;
* reference. Thus if the HSSFCell has type CELL_TYPE_NUMERIC, the contained
* value object should be of type NumberEval; if cell type is CELL_TYPE_STRING,
* contained value object should be of type StringEval
*
* Modified 09/07/09 by Petr Udalau - added method getEvaluationCell().
*/
public interface RefEval extends ValueEval {
@ -52,9 +48,4 @@ public interface RefEval extends ValueEval {
* Creates an {@link AreaEval} offset by a relative amount from this RefEval
*/
AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx);
/**
* @return EvaluationCell referred to by this RefEval
*/
EvaluationCell getEvaluationCell();
}

4
src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
View File

@ -42,10 +42,6 @@ public class HSSFCreationHelper implements CreationHelper {
return new HSSFHyperlink(type);
}
public HSSFEvaluationWorkbook createEvaluationWorkbook() {
return HSSFEvaluationWorkbook.create(workbook);
}
/**
* Creates a HSSFFormulaEvaluator, the object that evaluates formula cells.
*

4
src/java/org/apache/poi/ss/formula/LazyRefEval.java
View File

@ -52,10 +52,6 @@ final class LazyRefEval extends RefEvalBase {
return _evaluator.getEvalForCell(getRow(), getColumn());
}
public EvaluationCell getEvaluationCell() {
return _evaluator.getEvaluationCell(getRow(), getColumn());
}
public AreaEval offset(int relFirstRowIx, int relLastRowIx, int relFirstColIx, int relLastColIx) {
AreaI area = new OffsetArea(getRow(), getColumn(),

13
src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
View File

@ -22,10 +22,6 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*
*
* @author Josh Micich
*
* June 4, 2009: Added method setCellValue for setting values in cells.
*
* Modified 09/07/09 by Petr Udalau - added method getEvaluationCell(int rowIndex, int columnIndex).
*/
final class SheetRefEvaluator {
@ -57,13 +53,4 @@ final class SheetRefEvaluator {
}
return _sheet;
}
/**
* @param rowIndex Row index.
* @param columnIndex Column index.
* @return EvaluationCell by row and column.
*/
public EvaluationCell getEvaluationCell(int rowIndex, int columnIndex){
return getSheet().getCell(rowIndex, columnIndex);
}
}

12
src/java/org/apache/poi/ss/usermodel/CreationHelper.java
View File

@ -16,8 +16,6 @@
==================================================================== */
package org.apache.poi.ss.usermodel;
import org.apache.poi.ss.formula.EvaluationWorkbook;
/**
* An object that handles instantiating concrete
* classes of the various instances one needs for
@ -29,9 +27,6 @@ import org.apache.poi.ss.formula.EvaluationWorkbook;
* a given interface, without you having to worry
* about if you're dealing with HSSF or XSSF, despite
* Java being quite rubbish.
*
* Modified 09/07/09 by Petr Udalau - added method createEvaluationWorkbook().
*
*/
public interface CreationHelper {
/**
@ -50,13 +45,6 @@ public interface CreationHelper {
*/
Hyperlink createHyperlink(int type);
/**
* Creates EvaluationWorkbook.
*
* @return a EvaluationWorkbook instance
*/
EvaluationWorkbook createEvaluationWorkbook();
/**
* Creates FormulaEvaluator - an object that evaluates formula cells.
*

4
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
View File

@ -42,10 +42,6 @@ public class XSSFCreationHelper implements CreationHelper {
return new XSSFHyperlink(type);
}
public XSSFEvaluationWorkbook createEvaluationWorkbook() {
return XSSFEvaluationWorkbook.create(workbook);
}
/**
* Creates a XSSFFormulaEvaluator, the object that evaluates formula cells.
*