You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2008/04/16 00:47:43 UTC
svn commit: r648444 [1/3] - in /poi/branches/ooxml: ./
src/documentation/content/xdocs/ src/java/org/apache/poi/hssf/dev/
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...
Author: nick
Date: Tue Apr 15 15:47:30 2008
New Revision: 648444
URL: http://svn.apache.org/viewvc?rev=648444&view=rev
Log:
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648417 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk
........
r648156 | yegor | 2008-04-15 08:54:20 +0100 (Tue, 15 Apr 2008) | 1 line
TextShape is a common superclass of all shapes that can hold text. The subclasses are TextBox and AutoShape.
........
r648203 | yegor | 2008-04-15 11:05:22 +0100 (Tue, 15 Apr 2008) | 1 line
start improving handling of resources in HSLF. PPFont object represents a font in a presenatation.
........
r648274 | yegor | 2008-04-15 16:11:13 +0100 (Tue, 15 Apr 2008) | 1 line
TextSpecInfoAtom is present in PPT 2003+. When the text is changed we must update this record, otherwise the ppt becomes corrupted
........
r648276 | yegor | 2008-04-15 16:12:58 +0100 (Tue, 15 Apr 2008) | 1 line
Improved factoring of ppt objects. For ppt tabels Slide.getShapes() returns the Table object (was ShapeGroup)
........
r648303 | nick | 2008-04-15 17:00:50 +0100 (Tue, 15 Apr 2008) | 1 line
Nice and small change here... Update the formula parser code to use usermodel.HSSFWorkbook instead of model.Workbook. This should keep things a bit cleaner, and make it much easier for the formula code to work with XSSF
........
r648334 | josh | 2008-04-15 18:07:06 +0100 (Tue, 15 Apr 2008) | 1 line
Conditional Formatting (30311) - API improvements, added HSSFSheetConditionalFormatting
........
Added:
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
- copied, changed from r648334, poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java
- copied unchanged from r648334, poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/PPFont.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
- copied unchanged from r648334, poi/trunk/src/scratchpad/src/org/apache/poi/hslf/model/TextShape.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
- copied unchanged from r648334, poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/data/text_shapes.ppt
- copied unchanged from r648334, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/data/text_shapes.ppt
poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
- copied unchanged from r648334, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
- copied unchanged from r648334, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
Modified:
poi/branches/ooxml/ (props changed)
poi/branches/ooxml/src/documentation/content/xdocs/changes.xml
poi/branches/ooxml/src/documentation/content/xdocs/status.xml
poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/model/FormulaParser.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/NameRecord.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.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/NameXPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RangePtg.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/RefErrorPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/branches/ooxml/src/scratchpad/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/AutoShape.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/Line.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/Placeholder.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/Sheet.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/SimpleShape.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/Table.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/TableCell.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
poi/branches/ooxml/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/data/empty.ppt
poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
poi/branches/ooxml/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/formula/AbstractPtgTestCase.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/formula/TestArea3DPtg.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/formula/TestRef3DPtg.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
poi/branches/ooxml/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
Propchange: poi/branches/ooxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 15 15:47:30 2008
@@ -1 +1 @@
-/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-647832
+/poi/trunk:1-638784,638786-639486,639488-639601,639603-640056,640058-642562,642564-642566,642568-642574,642576-642736,642739-648417
Modified: poi/branches/ooxml/src/documentation/content/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/documentation/content/xdocs/changes.xml?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/documentation/content/xdocs/changes.xml (original)
+++ poi/branches/ooxml/src/documentation/content/xdocs/changes.xml Tue Apr 15 15:47:30 2008
@@ -44,6 +44,8 @@
<action dev="POI-DEVELOPERS" type="add">Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx</action>
</release>
<release version="3.0.3-beta1" date="2008-04-??">
+ <action dev="POI-DEVELOPERS" type="add">30311 - Conditional Formatting - improved API, added HSSFSheetConditionalFormatting</action>
+ <action dev="POI-DEVELOPERS" type="fix">Update the formula parser code to use a HSSFWorkbook, rather than the low level model.Workbook, to make things cleaner and make supporting XSSF formulas in future much easier</action>
<action dev="POI-DEVELOPERS" type="fix">Fix the logger used by POIFSFileSystem, so that commons-logging isn't required when not used</action>
<action dev="POI-DEVELOPERS" type="add">Update HSLFSlideShow and HSSFWorkbook to take advantage of POIFS updates, and allow reading embeded documents</action>
<action dev="POI-DEVELOPERS" type="add">Improve how POIFS works with directory entries, and update HWPFDocument to support reading an embeded word document</action>
Modified: poi/branches/ooxml/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/documentation/content/xdocs/status.xml?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/documentation/content/xdocs/status.xml (original)
+++ poi/branches/ooxml/src/documentation/content/xdocs/status.xml Tue Apr 15 15:47:30 2008
@@ -41,6 +41,8 @@
<action dev="POI-DEVELOPERS" type="add">Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx</action>
</release>
<release version="3.0.3-beta1" date="2008-04-??">
+ <action dev="POI-DEVELOPERS" type="add">30311 - Conditional Formatting - improved API, added HSSFSheetConditionalFormatting</action>
+ <action dev="POI-DEVELOPERS" type="fix">Update the formula parser code to use a HSSFWorkbook, rather than the low level model.Workbook, to make things cleaner and make supporting XSSF formulas in future much easier</action>
<action dev="POI-DEVELOPERS" type="fix">Fix the logger used by POIFSFileSystem, so that commons-logging isn't required when not used</action>
<action dev="POI-DEVELOPERS" type="add">Update HSLFSlideShow and HSSFWorkbook to take advantage of POIFS updates, and allow reading embeded documents</action>
<action dev="POI-DEVELOPERS" type="add">Improve how POIFS works with directory entries, and update HWPFDocument to support reading an embeded word document</action>
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/FormulaViewer.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/FormulaViewer.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/dev/FormulaViewer.java Tue Apr 15 15:47:30 2008
@@ -32,6 +32,7 @@
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.record.formula.*;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.model.*;
/**
@@ -99,7 +100,7 @@
StringBuffer buf = new StringBuffer();
if (token instanceof ExpPtg) return;
- buf.append(name=((OperationPtg) token).toFormulaString((Workbook)null));
+ buf.append(name=((OperationPtg) token).toFormulaString((HSSFWorkbook)null));
buf.append(sep);
switch (token.getPtgClass()) {
case Ptg.CLASS_REF :
@@ -168,7 +169,7 @@
StringBuffer buf = new StringBuffer();
for (int i=0;i<numptgs;i++) {
token = (Ptg) tokens.get(i);
- buf.append( token.toFormulaString((Workbook)null));
+ buf.append( token.toFormulaString((HSSFWorkbook)null));
switch (token.getPtgClass()) {
case Ptg.CLASS_REF :
buf.append("(R)");
@@ -188,7 +189,7 @@
private String composeFormula(FormulaRecord record)
{
- return org.apache.poi.hssf.model.FormulaParser.toFormulaString((Workbook)null,record.getParsedExpression());
+ return org.apache.poi.hssf.model.FormulaParser.toFormulaString((HSSFWorkbook)null,record.getParsedExpression());
}
/**
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=648444&r1=648443&r2=648444&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 Tue Apr 15 15:47:30 2008
@@ -27,6 +27,7 @@
import org.apache.poi.hssf.record.formula.*;
import org.apache.poi.hssf.record.formula.function.FunctionMetadata;
import org.apache.poi.hssf.record.formula.function.FunctionMetadataRegistry;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* This class parses a formula string into a List of tokens in RPN order.
@@ -86,7 +87,7 @@
*/
private char look;
- private Workbook book;
+ private HSSFWorkbook book;
/**
@@ -101,14 +102,14 @@
* model.Workbook, then use the convenience method on
* usermodel.HSSFFormulaEvaluator
*/
- public FormulaParser(String formula, Workbook book){
+ public FormulaParser(String formula, HSSFWorkbook book){
formulaString = formula;
pointer=0;
this.book = book;
formulaLength = formulaString.length();
}
- public static Ptg[] parse(String formula, Workbook book) {
+ public static Ptg[] parse(String formula, HSSFWorkbook book) {
FormulaParser fp = new FormulaParser(formula, book);
fp.parse();
return fp.getRPNPtg();
@@ -251,7 +252,7 @@
Match('!');
String sheetName = name;
String first = GetName();
- short externIdx = book.checkExternSheet(book.getSheetIndex(sheetName));
+ short externIdx = book.getExternalSheetIndex(book.getSheetIndex(sheetName));
if (look == ':') {
Match(':');
String second=GetName();
@@ -282,9 +283,9 @@
return new ReferencePtg(name);
}
- for(int i = 0; i < book.getNumNames(); i++) {
+ for(int i = 0; i < book.getNumberOfNames(); i++) {
// named range name matching is case insensitive
- if(book.getNameRecord(i).getNameText().equalsIgnoreCase(name)) {
+ if(book.getNameAt(i).getNameName().equalsIgnoreCase(name)) {
return new NamePtg(name, book);
}
}
@@ -926,7 +927,7 @@
* @param lptgs list of Ptg, can be null or empty
* @return a human readable String
*/
- public static String toFormulaString(Workbook book, List lptgs) {
+ public static String toFormulaString(HSSFWorkbook book, List lptgs) {
String retval = null;
if (lptgs == null || lptgs.size() == 0) return "#NAME";
Ptg[] ptgs = new Ptg[lptgs.size()];
@@ -952,7 +953,7 @@
* @param ptgs array of Ptg, can be null or empty
* @return a human readable String
*/
- public static String toFormulaString(Workbook book, Ptg[] ptgs) {
+ public static String toFormulaString(HSSFWorkbook book, Ptg[] ptgs) {
if (ptgs == null || ptgs.length == 0) {
// TODO - what is the justification for returning "#NAME" (which is not "#NAME?", btw)
return "#NAME";
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/CFRuleRecord.java Tue Apr 15 15:47:30 2008
@@ -26,9 +26,11 @@
import org.apache.poi.hssf.record.cf.FontFormatting;
import org.apache.poi.hssf.record.cf.PatternFormatting;
import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.StringUtil;
/**
* Conditional Formatting Rule Record.
@@ -62,7 +64,7 @@
private int field_5_options;
- private static final BitField modificationBits = bf(0x83FFFFFF); // Bits: font,align,bord,patt,prot
+ private static final BitField modificationBits = bf(0x003FFFFF); // Bits: font,align,bord,patt,prot
private static final BitField alignHor = bf(0x00000001); // 0 = Horizontal alignment modified
private static final BitField alignVer = bf(0x00000002); // 0 = Vertical alignment modified
private static final BitField alignWrap = bf(0x00000004); // 0 = Text wrapped flag modified
@@ -152,7 +154,7 @@
/**
* Creates a new comparison operation rule
*/
- public static CFRuleRecord create(Workbook workbook, String formulaText) {
+ public static CFRuleRecord create(HSSFWorkbook workbook, String formulaText) {
Ptg[] formula1 = parseFormula(formulaText, workbook);
return new CFRuleRecord(CONDITION_TYPE_FORMULA, ComparisonOperator.NO_COMPARISON,
formula1, null);
@@ -160,7 +162,7 @@
/**
* Creates a new comparison operation rule
*/
- public static CFRuleRecord create(Workbook workbook, byte comparisonOperation,
+ public static CFRuleRecord create(HSSFWorkbook workbook, byte comparisonOperation,
String formulaText1, String formulaText2) {
Ptg[] formula1 = parseFormula(formulaText1, workbook);
Ptg[] formula2 = parseFormula(formulaText2, workbook);
@@ -607,6 +609,8 @@
{
StringBuffer buffer = new StringBuffer();
buffer.append("[CFRULE]\n");
+ buffer.append(" OPTION FLAGS=0x"+Integer.toHexString(getOptions()));
+ /*
if( containsFontFormattingBlock())
{
buffer.append(fontFormatting.toString());
@@ -619,7 +623,7 @@
{
buffer.append(patternFormatting.toString());
}
- buffer.append("[/CFRULE]\n");
+ buffer.append("[/CFRULE]\n");*/
return buffer.toString();
}
@@ -651,7 +655,7 @@
/**
* @return <code>null</code> if <tt>formula</tt> was null.
*/
- private static Ptg[] parseFormula(String formula, Workbook workbook)
+ private static Ptg[] parseFormula(String formula, HSSFWorkbook workbook)
{
if(formula == null) {
return null;
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=648444&r1=648443&r2=648444&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 Tue Apr 15 15:47:30 2008
@@ -18,12 +18,17 @@
package org.apache.poi.hssf.record;
+import java.util.Iterator;
import java.util.List;
import java.util.Stack;
-import java.util.Iterator;
-import org.apache.poi.hssf.model.Workbook;
-import org.apache.poi.hssf.record.formula.*;
+import org.apache.poi.hssf.record.formula.Area3DPtg;
+import org.apache.poi.hssf.record.formula.DeletedArea3DPtg;
+import org.apache.poi.hssf.record.formula.DeletedRef3DPtg;
+import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.hssf.record.formula.Ref3DPtg;
+import org.apache.poi.hssf.record.formula.UnionPtg;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.RangeAddress;
import org.apache.poi.util.HexDump;
@@ -645,7 +650,7 @@
/** gets the reference , the area only (range)
* @return area reference
*/
- public String getAreaReference(Workbook book){
+ public String getAreaReference(HSSFWorkbook book){
if (field_13_name_definition == null || field_13_name_definition.isEmpty()) return "Error";
Ptg ptg = (Ptg) field_13_name_definition.peek();
String result = "";
@@ -679,7 +684,7 @@
* return an empty string if nothing is possible
* for it.
*/
- private String getAreaRefString(Ptg ptg,Workbook book) {
+ private String getAreaRefString(Ptg ptg,HSSFWorkbook book) {
if (ptg.getClass() == Area3DPtg.class){
return ptg.toFormulaString(book);
} else if (ptg.getClass() == Ref3DPtg.class){
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.formula.function.FunctionMetadata;
import org.apache.poi.hssf.record.formula.function.FunctionMetadataRegistry;
@@ -73,7 +73,7 @@
return field_2_fnc_index == FUNCTION_INDEX_EXTERNAL;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
return getName();
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AddPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AddPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AddPtg.java Tue Apr 15 15:47:30 2008
@@ -23,7 +23,7 @@
*/
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -75,7 +75,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "+";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
@@ -273,7 +273,7 @@
* @return text representation of this area reference that can be used in text
* formulas. The sheet name will get properly delimited if required.
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
// First do the sheet name
StringBuffer retval = new StringBuffer();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java Tue Apr 15 15:47:30 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java Tue Apr 15 15:47:30 2008
@@ -20,7 +20,7 @@
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.BitField;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -66,7 +66,7 @@
array[offset] = (byte) (sid + ptgClass);
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "#REF!";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java Tue Apr 15 15:47:30 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
@@ -58,7 +58,7 @@
return "AreaNAPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java Tue Apr 15 15:47:30 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
@@ -61,7 +61,7 @@
return "AreaNPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java Tue Apr 15 15:47:30 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
@@ -59,7 +59,7 @@
return "AreaNVPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java Tue Apr 15 15:47:30 2008
@@ -24,7 +24,7 @@
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -303,11 +303,11 @@
field_4_last_column = column;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return toFormulaString(this, book);
}
- protected static String toFormulaString(AreaI area, Workbook book) {
+ protected static String toFormulaString(AreaI area, HSSFWorkbook book) {
CellReference topLeft = new CellReference(area.getFirstRow(),area.getFirstColumn(),!area.isFirstRowRelative(),!area.isFirstColRelative());
CellReference botRight = new CellReference(area.getLastRow(),area.getLastColumn(),!area.isLastRowRelative(),!area.isLastColRelative());
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java Tue Apr 15 15:47:30 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java Tue Apr 15 15:47:30 2008
@@ -23,7 +23,7 @@
import org.apache.poi.util.StringUtil;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
@@ -198,7 +198,7 @@
return size;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
StringBuffer b = new StringBuffer();
b.append("{");
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java Tue Apr 15 15:47:30 2008
@@ -23,7 +23,7 @@
import org.apache.poi.util.StringUtil;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java Tue Apr 15 15:47:30 2008
@@ -23,7 +23,7 @@
import org.apache.poi.util.StringUtil;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.util.LittleEndian;
@@ -209,11 +209,11 @@
if(space.isSet(field_1_options)) {
return operands[ 0 ];
} else if (optiIf.isSet(field_1_options)) {
- return toFormulaString((Workbook)null) + "(" + operands[ 0 ] +")";
+ return toFormulaString((HSSFWorkbook)null) + "(" + operands[ 0 ] +")";
} else if (optGoto.isSet(field_1_options)) {
- return toFormulaString((Workbook)null) + operands[0]; //goto isn't a real formula element should not show up
+ return toFormulaString((HSSFWorkbook)null) + operands[0]; //goto isn't a real formula element should not show up
} else {
- return toFormulaString((Workbook)null) + "(" + operands[ 0 ] + ")";
+ return toFormulaString((HSSFWorkbook)null) + "(" + operands[ 0 ] + ")";
}
}
@@ -228,7 +228,7 @@
return -1;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
if(semiVolatile.isSet(field_1_options)) {
return "ATTR(semiVolatile)";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -70,7 +70,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return field_1_value ? "TRUE" : "FALSE";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -64,7 +64,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return CONCAT;
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/DividePtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/DividePtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/DividePtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -65,7 +65,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "/";
}
@@ -74,7 +74,7 @@
StringBuffer buffer = new StringBuffer();
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -64,7 +64,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "=";
}
@@ -74,7 +74,7 @@
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java Tue Apr 15 15:47:30 2008
@@ -19,7 +19,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.usermodel.HSSFErrorConstants;
@@ -70,7 +70,7 @@
array[offset + 1] = (byte)field_1_error_code;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
return HSSFErrorConstants.getText(field_1_error_code);
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -73,7 +73,7 @@
return field_2_first_col;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RecordFormatException("Coding Error: Expected ExpPtg to be converted from Shared to Non-Shared Formula by ValueRecordsAggregate, but it wasn't");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java Tue Apr 15 15:47:30 2008
@@ -19,7 +19,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -67,7 +67,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ">=";
}
@@ -77,7 +77,7 @@
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java Tue Apr 15 15:47:30 2008
@@ -25,7 +25,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -97,7 +97,7 @@
* Implementation of method from Ptg
* @param book the Sheet References
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return this.GREATERTHAN;
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -72,7 +72,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
return String.valueOf(getValue());
}
public byte getDefaultOperandClass() {
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -59,7 +59,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return " ";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java Tue Apr 15 15:47:30 2008
@@ -20,7 +20,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -68,7 +68,7 @@
return 2;
}
- public String toFormulaString( Workbook book )
+ public String toFormulaString( HSSFWorkbook book )
{
return "<=";
}
@@ -77,7 +77,7 @@
{
StringBuffer buffer = new StringBuffer();
buffer.append( operands[0] );
- buffer.append( toFormulaString( (Workbook) null ) );
+ buffer.append( toFormulaString( (HSSFWorkbook) null ) );
buffer.append( operands[1] );
return buffer.toString();
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java Tue Apr 15 15:47:30 2008
@@ -27,7 +27,7 @@
import java.util.List;
//POI
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -106,7 +106,7 @@
* Implementation of method from Ptg
* @param book the Sheet References
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return this.LESSTHAN;
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java Tue Apr 15 15:47:30 2008
@@ -25,7 +25,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -83,7 +83,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ""; // TODO: Not sure how to format this. -- DN
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java Tue Apr 15 15:47:30 2008
@@ -25,7 +25,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -57,7 +57,7 @@
array[offset] = (byte) (sid + ptgClass);
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "ERR#";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java Tue Apr 15 15:47:30 2008
@@ -24,7 +24,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -60,7 +60,7 @@
LittleEndian.putShort( array, offset + 1, (short)field_1_len_ref_subexpression );
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -55,7 +55,7 @@
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return " ";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java Tue Apr 15 15:47:30 2008
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -68,7 +68,7 @@
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "*";
}
@@ -77,9 +77,9 @@
{
StringBuffer buffer = new StringBuffer();
- buffer.append(operands[ 0 ].toFormulaString((Workbook)null));
+ buffer.append(operands[ 0 ].toFormulaString((HSSFWorkbook)null));
buffer.append("*");
- buffer.append(operands[ 1 ].toFormulaString((Workbook)null));
+ buffer.append(operands[ 1 ].toFormulaString((HSSFWorkbook)null));
return buffer.toString();
}
@@ -87,7 +87,7 @@
StringBuffer buffer = new StringBuffer();
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
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=648444&r1=648443&r2=648444&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 Tue Apr 15 15:47:30 2008
@@ -18,7 +18,8 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFName;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.NameRecord;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -48,26 +49,24 @@
* in the workbook. The search for the name record is case insensitive. If it is not found,
* it gets created.
*/
- public NamePtg(String name, Workbook book) {
+ public NamePtg(String name, HSSFWorkbook 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.getNumNames();
- NameRecord rec;
+ private static final int getOrCreateNameRecord(HSSFWorkbook book, String name) {
+ // perhaps this logic belongs in Workbook?
+ int countNames = book.getNumberOfNames();
for (int i = 0; i < countNames; i++) {
- rec = book.getNameRecord(i);
- if (name.equalsIgnoreCase(rec.getNameText())) {
+ if(name.equalsIgnoreCase( book.getNameName(i) )) {
return i;
}
}
- rec = new NameRecord();
- rec.setNameText(name);
- rec.setNameTextLength((byte) name.length());
- book.addName(rec);
+
+ HSSFName nameObj = book.createName();
+ nameObj.setNameName(name);
+
return countNames;
}
@@ -100,10 +99,9 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
- NameRecord rec = book.getNameRecord(field_1_label_index - 1);
- return rec.getNameText();
+ return book.getNameName(field_1_label_index - 1);
}
public byte getDefaultOperandClass() {return Ptg.CLASS_REF;}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -61,7 +61,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
// -1 to convert definedNameIndex from 1-based to zero-based
return book.resolveNameXText(field_1_ixals, field_2_ilbl-1);
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -64,7 +64,7 @@
return 2;
}
- public String toFormulaString( Workbook book )
+ public String toFormulaString( HSSFWorkbook book )
{
return "<>";
}
@@ -75,7 +75,7 @@
buffer.append( operands[0] );
- buffer.append( toFormulaString( (Workbook) null ) );
+ buffer.append( toFormulaString( (HSSFWorkbook) null ) );
buffer.append( operands[1] );
return buffer.toString();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -78,7 +78,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "" + getValue();
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java Tue Apr 15 15:47:30 2008
@@ -20,7 +20,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -71,7 +71,7 @@
return 1;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "()";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java Tue Apr 15 15:47:30 2008
@@ -23,7 +23,7 @@
*/
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -74,7 +74,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "%";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java Tue Apr 15 15:47:30 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -66,7 +66,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "^";
}
@@ -76,7 +76,7 @@
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/Ptg.java Tue Apr 15 15:47:30 2008
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.Stack;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -418,7 +418,7 @@
/**
* return a string representation of this token alone
*/
- public abstract String toFormulaString(Workbook book);
+ public abstract String toFormulaString(HSSFWorkbook book);
/**
* dump a debug representation (hexdump) to a string
*/
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RangePtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RangePtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RangePtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RangePtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -59,7 +59,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ":";
}
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=648444&r1=648443&r2=648444&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 Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.hssf.util.RangeAddress;
@@ -162,8 +162,8 @@
}
// TODO - find a home for this method
- // There is already a method on Workbook called getSheetName but it seems to do something different.
- static String getSheetName(Workbook book, int externSheetIndex) {
+ // There is already a method on HSSFWorkbook called getSheetName but it seems to do something different.
+ static String getSheetName(HSSFWorkbook book, int externSheetIndex) {
// TODO - there are 3 ways this method can return null. Is each valid?
if (book == null) {
return null;
@@ -179,7 +179,7 @@
* @return text representation of this cell reference that can be used in text
* formulas. The sheet name will get properly delimited if required.
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
StringBuffer retval = new StringBuffer();
String sheetName = getSheetName(book, field_1_index_extern_sheet);
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java Tue Apr 15 15:47:30 2008
@@ -21,7 +21,7 @@
import org.apache.poi.util.BitField;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -74,7 +74,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
//TODO -- should we store a cellreference instance in this ptg?? but .. memory is an issue, i believe!
return "#REF!";
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java Tue Apr 15 15:47:30 2008
@@ -28,7 +28,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* RefNAPtg
@@ -57,7 +57,7 @@
return "RefNAPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java Tue Apr 15 15:47:30 2008
@@ -27,7 +27,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* RefNPtg
@@ -58,7 +58,7 @@
return "RefNPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java Tue Apr 15 15:47:30 2008
@@ -23,7 +23,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* RefNVPtg
@@ -54,7 +54,7 @@
return "RefNVPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java Tue Apr 15 15:47:30 2008
@@ -22,7 +22,7 @@
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -176,7 +176,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
//TODO -- should we store a cellreference instance in this ptg?? but .. memory is an issue, i believe!
return (new CellReference(getRowAsInt(),getColumn(),!isRowRelative(),!isColRelative())).formatAsString();
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/StringPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/StringPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/StringPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.StringUtil;
@@ -109,7 +109,7 @@
}
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "\""+getValue()+"\"";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java Tue Apr 15 15:47:30 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -63,7 +63,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "-";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java Tue Apr 15 15:47:30 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -69,7 +69,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "+";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java Tue Apr 15 15:47:30 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -69,7 +69,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "+";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java Tue Apr 15 15:47:30 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -59,7 +59,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ",";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java Tue Apr 15 15:47:30 2008
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -51,7 +51,7 @@
return size;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "UNKNOWN";
}
Modified: poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java?rev=648444&r1=648443&r2=648444&view=diff
==============================================================================
--- poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java (original)
+++ poi/branches/ooxml/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java Tue Apr 15 15:47:30 2008
@@ -17,6 +17,7 @@
package org.apache.poi.hssf.usermodel;
+import org.apache.poi.hssf.record.CFRuleRecord;
import org.apache.poi.hssf.record.cf.BorderFormatting;
/**
@@ -58,18 +59,15 @@
public final static short BORDER_SLANTED_DASH_DOT = BorderFormatting.BORDER_SLANTED_DASH_DOT;
+ private final CFRuleRecord cfRuleRecord;
private final BorderFormatting borderFormatting;
- public HSSFBorderFormatting()
+ protected HSSFBorderFormatting(CFRuleRecord cfRuleRecord)
{
- borderFormatting = new BorderFormatting();
+ this.cfRuleRecord = cfRuleRecord;
+ this.borderFormatting = cfRuleRecord.getBorderFormatting();
}
- protected HSSFBorderFormatting(BorderFormatting borderFormatting)
- {
- this.borderFormatting = borderFormatting;
- }
-
protected BorderFormatting getBorderFormattingBlock()
{
return borderFormatting;
@@ -138,60 +136,110 @@
public void setBackwardDiagonalOn(boolean on)
{
borderFormatting.setBackwardDiagonalOn(on);
+ if( on )
+ {
+ cfRuleRecord.setTopLeftBottomRightBorderModified(on);
+ }
}
public void setBorderBottom(short border)
{
borderFormatting.setBorderBottom(border);
+ if( border != 0)
+ {
+ cfRuleRecord.setBottomBorderModified(true);
+ }
}
public void setBorderDiagonal(short border)
{
borderFormatting.setBorderDiagonal(border);
+ if( border != 0)
+ {
+ cfRuleRecord.setBottomLeftTopRightBorderModified(true);
+ cfRuleRecord.setTopLeftBottomRightBorderModified(true);
+ }
}
public void setBorderLeft(short border)
{
borderFormatting.setBorderLeft(border);
+ if( border != 0)
+ {
+ cfRuleRecord.setLeftBorderModified(true);
+ }
}
public void setBorderRight(short border)
{
borderFormatting.setBorderRight(border);
+ if( border != 0)
+ {
+ cfRuleRecord.setRightBorderModified(true);
+ }
}
public void setBorderTop(short border)
{
borderFormatting.setBorderTop(border);
+ if( border != 0)
+ {
+ cfRuleRecord.setTopBorderModified(true);
+ }
}
public void setBottomBorderColor(short color)
{
borderFormatting.setBottomBorderColor(color);
+ if( color != 0)
+ {
+ cfRuleRecord.setBottomBorderModified(true);
+ }
}
public void setDiagonalBorderColor(short color)
{
borderFormatting.setDiagonalBorderColor(color);
+ if( color != 0)
+ {
+ cfRuleRecord.setBottomLeftTopRightBorderModified(true);
+ cfRuleRecord.setTopLeftBottomRightBorderModified(true);
+ }
}
public void setForwardDiagonalOn(boolean on)
{
borderFormatting.setForwardDiagonalOn(on);
+ if( on )
+ {
+ cfRuleRecord.setBottomLeftTopRightBorderModified(on);
+ }
}
public void setLeftBorderColor(short color)
{
borderFormatting.setLeftBorderColor(color);
+ if( color != 0)
+ {
+ cfRuleRecord.setLeftBorderModified(true);
+ }
}
public void setRightBorderColor(short color)
{
borderFormatting.setRightBorderColor(color);
+ if( color != 0)
+ {
+ cfRuleRecord.setRightBorderModified(true);
+ }
}
public void setTopBorderColor(short color)
{
borderFormatting.setTopBorderColor(color);
+ if( color != 0)
+ {
+ cfRuleRecord.setTopBorderModified(true);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org