aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJosh Micich <josh@apache.org>2009-09-16 23:20:51 +0000
committerJosh Micich <josh@apache.org>2009-09-16 23:20:51 +0000
commita82e264754e5a6e74968ab1032892283764538f3 (patch)
tree75407bd1a233737ec8cfcb39293a590ab6c23bf7 /src
parent513f87c21312c387c23e9a96a260739d0def2903 (diff)
downloadpoi-a82e264754e5a6e74968ab1032892283764538f3.tar.gz
poi-a82e264754e5a6e74968ab1032892283764538f3.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/documentation/content/xdocs/status.xml4
-rw-r--r--src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java11
-rw-r--r--src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java4
-rw-r--r--src/java/org/apache/poi/ss/formula/LazyRefEval.java4
-rw-r--r--src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java13
-rw-r--r--src/java/org/apache/poi/ss/usermodel/CreationHelper.java24
-rw-r--r--src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java4
7 files changed, 8 insertions, 56 deletions
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index fcb0640b82..c4c9288550 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -32,9 +32,7 @@
</developers>
<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>
+ <release version="3.5-beta7" date="2009-??-??">
<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>
diff --git a/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java b/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
index c2b4583254..b4200825d8 100644
--- a/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
+++ b/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
@@ -17,19 +17,15 @@
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;
- *
+ *
* RefEval is the super interface for Ref2D and Ref3DEval. Basically a RefEval
* impl should contain reference to the original ReferencePtg or Ref3DPtg as
* well as the final "value" resulting from the evaluation of the cell
* 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();
}
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java b/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
index 597af02c22..faee42b83f 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
@@ -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.
*
diff --git a/src/java/org/apache/poi/ss/formula/LazyRefEval.java b/src/java/org/apache/poi/ss/formula/LazyRefEval.java
index 3626bc0412..2a97c67c48 100644
--- a/src/java/org/apache/poi/ss/formula/LazyRefEval.java
+++ b/src/java/org/apache/poi/ss/formula/LazyRefEval.java
@@ -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(),
diff --git a/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java b/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
index b3ff5e4d3e..97568cfec4 100644
--- a/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
+++ b/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
@@ -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);
- }
}
diff --git a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java b/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
index b45477105a..c073237232 100644
--- a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
+++ b/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
@@ -16,11 +16,9 @@
==================================================================== */
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
+ * classes of the various instances one needs for
* HSSF and XSSF.
* Works around a major shortcoming in Java, where we
* can't have static methods on interfaces or abstract
@@ -29,40 +27,30 @@ 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 {
/**
- * Creates a new RichTextString instance
+ * Creates a new RichTextString instance
* @param text The text to initialise the RichTextString with
*/
RichTextString createRichTextString(String text);
-
+
/**
* Creates a new DataFormat instance
*/
DataFormat createDataFormat();
-
+
/**
* Creates a new Hyperlink, of the given type
*/
Hyperlink createHyperlink(int type);
/**
- * Creates EvaluationWorkbook.
- *
- * @return a EvaluationWorkbook instance
- */
- EvaluationWorkbook createEvaluationWorkbook();
-
- /**
* Creates FormulaEvaluator - an object that evaluates formula cells.
*
* @return a FormulaEvaluator instance
*/
FormulaEvaluator createFormulaEvaluator();
-
+
ClientAnchor createClientAnchor();
-} \ No newline at end of file
+}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
index 6f4dc955d5..177cad89a9 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
@@ -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.
*