You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2008/05/19 08:35:32 UTC
svn commit: r657731 [1/5] - in /poi/tags/REL_3_1_BETA2/src:
contrib/src/org/apache/poi/hssf/usermodel/contrib/ documentation/
documentation/content/xdocs/ documentation/content/xdocs/hssf/
java/org/apache/poi/hssf/dev/ java/org/apache/poi/hssf/model/ j...
Author: yegor
Date: Sun May 18 23:35:30 2008
New Revision: 657731
URL: http://svn.apache.org/viewvc?rev=657731&view=rev
Log:
merged with trunk r657726
Added:
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java
- copied unchanged from r657730, poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java
- copied unchanged from r657730, poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java
- copied unchanged from r657730, poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java
poi/tags/REL_3_1_BETA2/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
- copied unchanged from r657730, poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/data/24207.xls
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/data/24207.xls
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/data/36947.xls
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/data/36947.xls
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/data/39634.xls
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/data/39634.xls
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/data/44235.xls
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/data/44235.xls
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/data/ex41187-19267.xls
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/data/ex41187-19267.xls
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/data/ex42570-20305.xls
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/data/ex42570-20305.xls
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/TestArrayPtg.java
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestArrayPtg.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/eval/TestAreaEval.java
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/eval/TestAreaEval.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.qwp
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.qwp
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.wps
- copied unchanged from r657730, poi/trunk/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.wps
Modified:
poi/tags/REL_3_1_BETA2/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java
poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/changes.xml
poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/hssf/quick-guide.xml
poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/status.xml
poi/tags/REL_3_1_BETA2/src/documentation/release-guide.txt
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/dev/BiffViewer.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/model/FormulaParser.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/model/Sheet.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/LabelRecord.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/PaneRecord.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/RowRecord.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/constant/ConstantValueParser.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/constant/ErrorConstant.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/FuncPtg.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/eval/Area2DEval.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/eval/Area3DEval.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/record/formula/function/FunctionMetadataReader.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/poifs/storage/BlockListImpl.java
poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/poifs/storage/RawDataBlock.java
poi/tags/REL_3_1_BETA2/src/records/definitions/pane_record.xml
poi/tags/REL_3_1_BETA2/src/resources/main/org/apache/poi/hssf/record/formula/function/functionMetadata-asGenerated.txt
poi/tags/REL_3_1_BETA2/src/resources/main/org/apache/poi/hssf/record/formula/function/functionMetadata.txt
poi/tags/REL_3_1_BETA2/src/scratchpad/examples/src/org/apache/poi/hslf/examples/DataExtraction.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/model/ShapeFactory.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/model/TextRun.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/usermodel/ObjectData.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hslf/usermodel/RichTextRun.java
poi/tags/REL_3_1_BETA2/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/HSSFTests.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/model/TestSheet.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/AllFormulaTests.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/TestFuncPtg.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/eval/AllFormulaEvalTests.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/function/ExcelFileFormatDocFunctionExtractor.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/functions/TestCountFuncs.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndex.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/AllUserModelTests.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/hssf/usermodel/TestNamedRange.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
poi/tags/REL_3_1_BETA2/src/testcases/org/apache/poi/poifs/storage/TestRawDataBlock.java
Modified: poi/tags/REL_3_1_BETA2/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java (original)
+++ poi/tags/REL_3_1_BETA2/src/contrib/src/org/apache/poi/hssf/usermodel/contrib/HSSFCellUtil.java Sun May 18 23:35:30 2008
@@ -55,10 +55,10 @@
*/
public static HSSFRow getRow( int rowCounter, HSSFSheet sheet )
{
- HSSFRow row = sheet.getRow( (short) rowCounter );
+ HSSFRow row = sheet.getRow( rowCounter );
if ( row == null )
{
- row = sheet.createRow( (short) rowCounter );
+ row = sheet.createRow( rowCounter );
}
return row;
@@ -66,7 +66,8 @@
/**
- * Get a specific cell from a row. If the cell doesn't exist, then create it.
+ * Get a specific cell from a row. If the cell doesn't exist,
+ * then create it.
*
*@param row The row that the cell is part of
*@param column The column index that the cell is in.
@@ -74,11 +75,11 @@
*/
public static HSSFCell getCell( HSSFRow row, int column )
{
- HSSFCell cell = row.getCell( (short) column );
+ HSSFCell cell = row.getCell( column );
if ( cell == null )
{
- cell = row.createCell( (short) column );
+ cell = row.createCell( (short)column );
}
return cell;
}
@@ -98,7 +99,7 @@
{
HSSFCell cell = getCell( row, column );
- cell.setCellValue( value );
+ cell.setCellValue(new HSSFRichTextString(value));
if ( style != null )
{
cell.setCellStyle( style );
@@ -222,7 +223,7 @@
public static HSSFCell translateUnicodeValues( HSSFCell cell )
{
- String s = cell.getStringCellValue();
+ String s = cell.getRichStringCellValue().getString();
boolean foundUnicode = false;
for ( Iterator i = unicodeMappings.entrySet().iterator(); i.hasNext(); )
Modified: poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/changes.xml?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/changes.xml (original)
+++ poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/changes.xml Sun May 18 23:35:30 2008
@@ -37,6 +37,17 @@
<!-- Don't forget to update status.xml too! -->
<release version="3.1-beta2" date="2008-05-??">
+ <action dev="POI-DEVELOPERS" type="fix">44306 - fixed reading/writing of AttrPtg(type=choose) and method toFormulaString() for CHOOSE formulas</action>
+ <action dev="POI-DEVELOPERS" type="fix">24207 - added HSSFName.isDeleted() to check if the name points to cell that no longer exists</action>
+ <action dev="POI-DEVELOPERS" type="fix">40414 - fixed selected/active sheet after removing sheet from workbook</action>
+ <action dev="POI-DEVELOPERS" type="fix">44523 - fixed workbook sheet selection and focus</action>
+ <action dev="POI-DEVELOPERS" type="fix">45000 - Fixed NPE in ListLevel when numberText is null</action>
+ <action dev="POI-DEVELOPERS" type="fix">44985 - Properly update TextSpecInfoAtom when the parent text is changed</action>
+ <action dev="POI-DEVELOPERS" type="fix">41187 - fixed HSSFSheet to properly read xls files without ROW records</action>
+ <action dev="POI-DEVELOPERS" type="fix">44950 - fixed HSSFFormulaEvaluator.evaluateInCell() and Area3DEval.getValue() also added validation for number of elements in AreaEvals</action>
+ <action dev="POI-DEVELOPERS" type="fix">42570 - fixed LabelRecord to use empty string instead of null when the length is zero.</action>
+ <action dev="POI-DEVELOPERS" type="fix">42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.</action>
+ <action dev="POI-DEVELOPERS" type="fix">Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes</action>
<action dev="POI-DEVELOPERS" type="fix">44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file</action>
<action dev="POI-DEVELOPERS" type="fix">44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters</action>
<action dev="POI-DEVELOPERS" type="fix">44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)</action>
Modified: poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/hssf/quick-guide.xml
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/hssf/quick-guide.xml?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/hssf/quick-guide.xml (original)
+++ poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/hssf/quick-guide.xml Sun May 18 23:35:30 2008
@@ -1225,7 +1225,19 @@
// Do something with this corner cell
}
}
- </source>
+ </source>
+ <p>
+ Note, when a cell is deleted, Excel does not delete the attached named range.
+ As result, workbook can contain named ranges that point to cells that no longer exist.
+ You should check the validity of a reference before constructing AreaReference
+ </p>
+ <source>
+ if(hssfName.isDeleted()){
+ //named range points to a deleted cell.
+ } else {
+ AreaReference ref = new AreaReference(hssfName.getReference());
+ }
+ </source>
</section>
<anchor id="CellComments"/>
<section><title>Cell Comments</title>
Modified: poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/status.xml?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/status.xml (original)
+++ poi/tags/REL_3_1_BETA2/src/documentation/content/xdocs/status.xml Sun May 18 23:35:30 2008
@@ -34,6 +34,17 @@
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.1-beta2" date="2008-05-??">
+ <action dev="POI-DEVELOPERS" type="fix">44306 - fixed reading/writing of AttrPtg(type=choose) and method toFormulaString() for CHOOSE formulas</action>
+ <action dev="POI-DEVELOPERS" type="fix">24207 - added HSSFName.isDeleted() to check if the name points to cell that no longer exists</action>
+ <action dev="POI-DEVELOPERS" type="fix">40414 - fixed selected/active sheet after removing sheet from workbook</action>
+ <action dev="POI-DEVELOPERS" type="fix">44523 - fixed workbook sheet selection and focus</action>
+ <action dev="POI-DEVELOPERS" type="fix">45000 - Fixed NPE in ListLevel when numberText is null</action>
+ <action dev="POI-DEVELOPERS" type="fix">44985 - Properly update TextSpecInfoAtom when the parent text is changed</action>
+ <action dev="POI-DEVELOPERS" type="fix">41187 - fixed HSSFSheet to properly read xls files without ROW records</action>
+ <action dev="POI-DEVELOPERS" type="fix">44950 - fixed HSSFFormulaEvaluator.evaluateInCell() and Area3DEval.getValue() also added validation for number of elements in AreaEvals</action>
+ <action dev="POI-DEVELOPERS" type="fix">42570 - fixed LabelRecord to use empty string instead of null when the length is zero.</action>
+ <action dev="POI-DEVELOPERS" type="fix">42564 - fixed ArrayPtg to use ConstantValueParser. Fixed a few other ArrayPtg encoding issues.</action>
+ <action dev="POI-DEVELOPERS" type="fix">Follow-on from 28754 - StringPtg.toFormulaString() should escape double quotes</action>
<action dev="POI-DEVELOPERS" type="fix">44929 - Improved error handling in HSSFWorkbook when attempting to read a BIFF5 file</action>
<action dev="POI-DEVELOPERS" type="fix">44675 - Parameter operand classes (function metadata) required to encode SUM() etc properly. Added parse validation for number of parameters</action>
<action dev="POI-DEVELOPERS" type="fix">44921 - allow Ptg.writeBytes() to be called on relative ref Ptgs (RefN* and AreaN*)</action>
Modified: poi/tags/REL_3_1_BETA2/src/documentation/release-guide.txt
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/documentation/release-guide.txt?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/documentation/release-guide.txt (original)
+++ poi/tags/REL_3_1_BETA2/src/documentation/release-guide.txt Sun May 18 23:35:30 2008
@@ -37,14 +37,14 @@
3. Checkout the tagged version
{code}
cd tags
-svn checkout https://svn.apache.org/repos/asf/poi/tags/TAG
+svn checkout https://svn.apache.org/repos/asf/poi/tags/$TAG
{code}
4. Merge (if required)
{code}
cd $TAG
-$ svn merge https://svn.apache.org/repos/asf/poi/tags/TAG \
+$ svn merge https://svn.apache.org/repos/asf/poi/tags/$TAG \
https://svn.apache.org/repos/asf/poi/trunk
{code}
Modified: poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/dev/BiffViewer.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/dev/BiffViewer.java?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/dev/BiffViewer.java (original)
+++ poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/dev/BiffViewer.java Sun May 18 23:35:30 2008
@@ -15,22 +15,20 @@
limitations under the License.
==================================================================== */
-/*
- * BiffViewer.java
- *
- * Created on November 13, 2001, 9:23 AM
- */
package org.apache.poi.hssf.dev;
-import org.apache.poi.hssf.record.*;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.util.HexDump;
-
+import java.io.File;
import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.FileOutputStream;
import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
import java.util.ArrayList;
+import org.apache.poi.hssf.record.*;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.util.HexDump;
+
/**
* Utillity for reading in BIFF8 records and displaying data from them.
*
@@ -38,38 +36,26 @@
*@author Glen Stampoultzis (glens at apache.org)
*@see #main
*/
-
-public class BiffViewer {
- String filename;
+public final class BiffViewer {
+ private final File _inputFile;
private boolean dump;
+ private final PrintStream _ps;
- /**
- * Creates new BiffViewer
- *
- *@param args
- */
-
- public BiffViewer(String[] args) {
- if (args.length > 0) {
- filename = args[0];
- } else {
- System.out.println("BIFFVIEWER REQUIRES A FILENAME***");
- }
+ public BiffViewer(File inFile, PrintStream ps) {
+ _inputFile = inFile;
+ _ps = ps;
}
/**
* Method run starts up BiffViewer...
*/
-
public void run() {
try {
- POIFSFileSystem fs =
- new POIFSFileSystem(new FileInputStream(filename));
- InputStream stream =
- fs.createDocumentInputStream("Workbook");
- createRecords(stream, dump);
+ POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(_inputFile));
+ InputStream stream = fs.createDocumentInputStream("Workbook");
+ createRecords(stream, dump, _ps);
} catch (Exception e) {
e.printStackTrace();
}
@@ -86,451 +72,306 @@
* InputStream
*@exception RecordFormatException on error processing the InputStream
*/
-
- public static Record[] createRecords(InputStream in, boolean dump)
+ public static Record[] createRecords(InputStream in, boolean dump, PrintStream ps)
throws RecordFormatException {
ArrayList records = new ArrayList();
RecordDetails activeRecord = null;
- try {
- BiffviewRecordInputStream recStream = new BiffviewRecordInputStream(in);
- while (recStream.hasNextRecord()) {
+ BiffviewRecordInputStream recStream = new BiffviewRecordInputStream(in);
+ while (recStream.hasNextRecord()) {
recStream.nextRecord();
if (recStream.getSid() != 0) {
- Record record = createRecord (recStream);
+ Record record = createRecord (recStream);
if (record.getSid() != ContinueRecord.sid)
{
records.add(record);
if (activeRecord != null)
- activeRecord.dump();
- activeRecord = new RecordDetails(recStream.getSid(), recStream.getLength(), (int)recStream.getPos(), record);
+ activeRecord.dump(ps);
+ activeRecord = new RecordDetails(recStream.getSid(), recStream.getLength(), (int)recStream.getPos(), record);
}
if (dump) {
- recStream.dumpBytes();
- }
+ recStream.dumpBytes(ps);
}
- }
- activeRecord.dump();
- } catch (IOException e) {
- throw new RecordFormatException("Error reading bytes", e);
+ }
+ }
+ if (activeRecord != null) {
+ activeRecord.dump(ps);
}
Record[] retval = new Record[records.size()];
-
- retval = (Record[]) records.toArray(retval);
+ records.toArray(retval);
return retval;
}
- private static void dumpNormal(Record record, int startloc, short rectype, short recsize)
- {
- //System.out.println("Offset 0x" + Integer.toHexString(startloc) + " (" + startloc + ")");
- System.out.println( "recordid = 0x" + Integer.toHexString( rectype ) + ", size = " + recsize );
- System.out.println( record.toString() );
-
- }
/**
- * Essentially a duplicate of RecordFactory. Kept seperate as not to screw
+ * Essentially a duplicate of RecordFactory. Kept separate as not to screw
* up non-debug operations.
*
*/
private static Record createRecord( RecordInputStream in )
{
- Record retval = null;
-
switch ( in.getSid() )
{
-
case ChartRecord.sid:
- retval = new ChartRecord( in );
- break;
+ return new ChartRecord( in );
case ChartFormatRecord.sid:
- retval = new ChartFormatRecord( in );
- break;
+ return new ChartFormatRecord( in );
case SeriesRecord.sid:
- retval = new SeriesRecord( in );
- break;
+ return new SeriesRecord( in );
case BeginRecord.sid:
- retval = new BeginRecord( in );
- break;
+ return new BeginRecord( in );
case EndRecord.sid:
- retval = new EndRecord( in );
- break;
+ return new EndRecord( in );
case BOFRecord.sid:
- retval = new BOFRecord( in );
- break;
+ return new BOFRecord( in );
case InterfaceHdrRecord.sid:
- retval = new InterfaceHdrRecord( in );
- break;
+ return new InterfaceHdrRecord( in );
case MMSRecord.sid:
- retval = new MMSRecord( in );
- break;
+ return new MMSRecord( in );
case InterfaceEndRecord.sid:
- retval = new InterfaceEndRecord( in );
- break;
+ return new InterfaceEndRecord( in );
case WriteAccessRecord.sid:
- retval = new WriteAccessRecord( in );
- break;
+ return new WriteAccessRecord( in );
case CodepageRecord.sid:
- retval = new CodepageRecord( in );
- break;
+ return new CodepageRecord( in );
case DSFRecord.sid:
- retval = new DSFRecord( in );
- break;
+ return new DSFRecord( in );
case TabIdRecord.sid:
- retval = new TabIdRecord( in );
- break;
+ return new TabIdRecord( in );
case FnGroupCountRecord.sid:
- retval = new FnGroupCountRecord( in );
- break;
+ return new FnGroupCountRecord( in );
case WindowProtectRecord.sid:
- retval = new WindowProtectRecord( in );
- break;
+ return new WindowProtectRecord( in );
case ProtectRecord.sid:
- retval = new ProtectRecord( in );
- break;
+ return new ProtectRecord( in );
case PasswordRecord.sid:
- retval = new PasswordRecord( in );
- break;
+ return new PasswordRecord( in );
case ProtectionRev4Record.sid:
- retval = new ProtectionRev4Record( in );
- break;
+ return new ProtectionRev4Record( in );
case PasswordRev4Record.sid:
- retval = new PasswordRev4Record( in );
- break;
+ return new PasswordRev4Record( in );
case WindowOneRecord.sid:
- retval = new WindowOneRecord( in );
- break;
+ return new WindowOneRecord( in );
case BackupRecord.sid:
- retval = new BackupRecord( in );
- break;
+ return new BackupRecord( in );
case HideObjRecord.sid:
- retval = new HideObjRecord( in );
- break;
+ return new HideObjRecord( in );
case DateWindow1904Record.sid:
- retval = new DateWindow1904Record( in );
- break;
+ return new DateWindow1904Record( in );
case PrecisionRecord.sid:
- retval = new PrecisionRecord( in );
- break;
+ return new PrecisionRecord( in );
case RefreshAllRecord.sid:
- retval = new RefreshAllRecord( in );
- break;
+ return new RefreshAllRecord( in );
case BookBoolRecord.sid:
- retval = new BookBoolRecord( in );
- break;
+ return new BookBoolRecord( in );
case FontRecord.sid:
- retval = new FontRecord( in );
- break;
+ return new FontRecord( in );
case FormatRecord.sid:
- retval = new FormatRecord( in );
- break;
+ return new FormatRecord( in );
case ExtendedFormatRecord.sid:
- retval = new ExtendedFormatRecord( in );
- break;
+ return new ExtendedFormatRecord( in );
case StyleRecord.sid:
- retval = new StyleRecord( in );
- break;
+ return new StyleRecord( in );
case UseSelFSRecord.sid:
- retval = new UseSelFSRecord( in );
- break;
+ return new UseSelFSRecord( in );
case BoundSheetRecord.sid:
- retval = new BoundSheetRecord( in );
- break;
+ return new BoundSheetRecord( in );
case CountryRecord.sid:
- retval = new CountryRecord( in );
- break;
+ return new CountryRecord( in );
case SSTRecord.sid:
- retval = new SSTRecord( in );
- break;
+ return new SSTRecord( in );
case ExtSSTRecord.sid:
- retval = new ExtSSTRecord( in );
- break;
+ return new ExtSSTRecord( in );
case EOFRecord.sid:
- retval = new EOFRecord( in );
- break;
+ return new EOFRecord( in );
case IndexRecord.sid:
- retval = new IndexRecord( in );
- break;
+ return new IndexRecord( in );
case CalcModeRecord.sid:
- retval = new CalcModeRecord( in );
- break;
+ return new CalcModeRecord( in );
case CalcCountRecord.sid:
- retval = new CalcCountRecord( in );
- break;
+ return new CalcCountRecord( in );
case RefModeRecord.sid:
- retval = new RefModeRecord( in );
- break;
+ return new RefModeRecord( in );
case IterationRecord.sid:
- retval = new IterationRecord( in );
- break;
+ return new IterationRecord( in );
case DeltaRecord.sid:
- retval = new DeltaRecord( in );
- break;
+ return new DeltaRecord( in );
case SaveRecalcRecord.sid:
- retval = new SaveRecalcRecord( in );
- break;
+ return new SaveRecalcRecord( in );
case PrintHeadersRecord.sid:
- retval = new PrintHeadersRecord( in );
- break;
+ return new PrintHeadersRecord( in );
case PrintGridlinesRecord.sid:
- retval = new PrintGridlinesRecord( in );
- break;
+ return new PrintGridlinesRecord( in );
case GridsetRecord.sid:
- retval = new GridsetRecord( in );
- break;
+ return new GridsetRecord( in );
case DrawingGroupRecord.sid:
- retval = new DrawingGroupRecord( in );
- break;
+ return new DrawingGroupRecord( in );
case DrawingRecordForBiffViewer.sid:
- retval = new DrawingRecordForBiffViewer( in );
- break;
+ return new DrawingRecordForBiffViewer( in );
case DrawingSelectionRecord.sid:
- retval = new DrawingSelectionRecord( in );
- break;
+ return new DrawingSelectionRecord( in );
case GutsRecord.sid:
- retval = new GutsRecord( in );
- break;
+ return new GutsRecord( in );
case DefaultRowHeightRecord.sid:
- retval = new DefaultRowHeightRecord( in );
- break;
+ return new DefaultRowHeightRecord( in );
case WSBoolRecord.sid:
- retval = new WSBoolRecord( in );
- break;
+ return new WSBoolRecord( in );
case HeaderRecord.sid:
- retval = new HeaderRecord( in );
- break;
+ return new HeaderRecord( in );
case FooterRecord.sid:
- retval = new FooterRecord( in );
- break;
+ return new FooterRecord( in );
case HCenterRecord.sid:
- retval = new HCenterRecord( in );
- break;
+ return new HCenterRecord( in );
case VCenterRecord.sid:
- retval = new VCenterRecord( in );
- break;
+ return new VCenterRecord( in );
case PrintSetupRecord.sid:
- retval = new PrintSetupRecord( in );
- break;
+ return new PrintSetupRecord( in );
case DefaultColWidthRecord.sid:
- retval = new DefaultColWidthRecord( in );
- break;
+ return new DefaultColWidthRecord( in );
case DimensionsRecord.sid:
- retval = new DimensionsRecord( in );
- break;
+ return new DimensionsRecord( in );
case RowRecord.sid:
- retval = new RowRecord( in );
- break;
+ return new RowRecord( in );
case LabelSSTRecord.sid:
- retval = new LabelSSTRecord( in );
- break;
+ return new LabelSSTRecord( in );
case RKRecord.sid:
- retval = new RKRecord( in );
- break;
+ return new RKRecord( in );
case NumberRecord.sid:
- retval = new NumberRecord( in );
- break;
+ return new NumberRecord( in );
case DBCellRecord.sid:
- retval = new DBCellRecord( in );
- break;
+ return new DBCellRecord( in );
case WindowTwoRecord.sid:
- retval = new WindowTwoRecord( in );
- break;
+ return new WindowTwoRecord( in );
case SelectionRecord.sid:
- retval = new SelectionRecord( in );
- break;
+ return new SelectionRecord( in );
case ContinueRecord.sid:
- retval = new ContinueRecord( in );
- break;
+ return new ContinueRecord( in );
case LabelRecord.sid:
- retval = new LabelRecord( in );
- break;
+ return new LabelRecord( in );
case MulRKRecord.sid:
- retval = new MulRKRecord( in );
- break;
+ return new MulRKRecord( in );
case MulBlankRecord.sid:
- retval = new MulBlankRecord( in );
- break;
+ return new MulBlankRecord( in );
case BlankRecord.sid:
- retval = new BlankRecord( in );
- break;
+ return new BlankRecord( in );
case BoolErrRecord.sid:
- retval = new BoolErrRecord( in );
- break;
+ return new BoolErrRecord( in );
case ColumnInfoRecord.sid:
- retval = new ColumnInfoRecord( in );
- break;
+ return new ColumnInfoRecord( in );
case MergeCellsRecord.sid:
- retval = new MergeCellsRecord( in );
- break;
+ return new MergeCellsRecord( in );
case AreaRecord.sid:
- retval = new AreaRecord( in );
- break;
+ return new AreaRecord( in );
case DataFormatRecord.sid:
- retval = new DataFormatRecord( in );
- break;
+ return new DataFormatRecord( in );
case BarRecord.sid:
- retval = new BarRecord( in );
- break;
+ return new BarRecord( in );
case DatRecord.sid:
- retval = new DatRecord( in );
- break;
+ return new DatRecord( in );
case PlotGrowthRecord.sid:
- retval = new PlotGrowthRecord( in );
- break;
+ return new PlotGrowthRecord( in );
case UnitsRecord.sid:
- retval = new UnitsRecord( in );
- break;
+ return new UnitsRecord( in );
case FrameRecord.sid:
- retval = new FrameRecord( in );
- break;
+ return new FrameRecord( in );
case ValueRangeRecord.sid:
- retval = new ValueRangeRecord( in );
- break;
+ return new ValueRangeRecord( in );
case SeriesListRecord.sid:
- retval = new SeriesListRecord( in );
- break;
+ return new SeriesListRecord( in );
case FontBasisRecord.sid:
- retval = new FontBasisRecord( in );
- break;
+ return new FontBasisRecord( in );
case FontIndexRecord.sid:
- retval = new FontIndexRecord( in );
- break;
+ return new FontIndexRecord( in );
case LineFormatRecord.sid:
- retval = new LineFormatRecord( in );
- break;
+ return new LineFormatRecord( in );
case AreaFormatRecord.sid:
- retval = new AreaFormatRecord( in );
- break;
+ return new AreaFormatRecord( in );
case LinkedDataRecord.sid:
- retval = new LinkedDataRecord( in );
- break;
+ return new LinkedDataRecord( in );
case FormulaRecord.sid:
- retval = new FormulaRecord( in );
- break;
+ return new FormulaRecord( in );
case SheetPropertiesRecord.sid:
- retval = new SheetPropertiesRecord( in );
- break;
+ return new SheetPropertiesRecord( in );
case DefaultDataLabelTextPropertiesRecord.sid:
- retval = new DefaultDataLabelTextPropertiesRecord( in );
- break;
+ return new DefaultDataLabelTextPropertiesRecord( in );
case TextRecord.sid:
- retval = new TextRecord( in );
- break;
+ return new TextRecord( in );
case AxisParentRecord.sid:
- retval = new AxisParentRecord( in );
- break;
+ return new AxisParentRecord( in );
case AxisLineFormatRecord.sid:
- retval = new AxisLineFormatRecord( in );
- break;
+ return new AxisLineFormatRecord( in );
case SupBookRecord.sid:
- retval = new SupBookRecord( in );
- break;
+ return new SupBookRecord( in );
case ExternSheetRecord.sid:
- retval = new ExternSheetRecord( in );
- break;
+ return new ExternSheetRecord( in );
case SCLRecord.sid:
- retval = new SCLRecord( in );
- break;
+ return new SCLRecord( in );
case SeriesToChartGroupRecord.sid:
- retval = new SeriesToChartGroupRecord( in );
- break;
+ return new SeriesToChartGroupRecord( in );
case AxisUsedRecord.sid:
- retval = new AxisUsedRecord( in );
- break;
+ return new AxisUsedRecord( in );
case AxisRecord.sid:
- retval = new AxisRecord( in );
- break;
+ return new AxisRecord( in );
case CategorySeriesAxisRecord.sid:
- retval = new CategorySeriesAxisRecord( in );
- break;
+ return new CategorySeriesAxisRecord( in );
case AxisOptionsRecord.sid:
- retval = new AxisOptionsRecord( in );
- break;
+ return new AxisOptionsRecord( in );
case TickRecord.sid:
- retval = new TickRecord( in );
- break;
+ return new TickRecord( in );
case SeriesTextRecord.sid:
- retval = new SeriesTextRecord( in );
- break;
+ return new SeriesTextRecord( in );
case ObjectLinkRecord.sid:
- retval = new ObjectLinkRecord( in );
- break;
+ return new ObjectLinkRecord( in );
case PlotAreaRecord.sid:
- retval = new PlotAreaRecord( in );
- break;
+ return new PlotAreaRecord( in );
case SeriesIndexRecord.sid:
- retval = new SeriesIndexRecord( in );
- break;
+ return new SeriesIndexRecord( in );
case LegendRecord.sid:
- retval = new LegendRecord( in );
- break;
+ return new LegendRecord( in );
case LeftMarginRecord.sid:
- retval = new LeftMarginRecord( in );
- break;
+ return new LeftMarginRecord( in );
case RightMarginRecord.sid:
- retval = new RightMarginRecord( in );
- break;
+ return new RightMarginRecord( in );
case TopMarginRecord.sid:
- retval = new TopMarginRecord( in );
- break;
+ return new TopMarginRecord( in );
case BottomMarginRecord.sid:
- retval = new BottomMarginRecord( in );
- break;
+ return new BottomMarginRecord( in );
case PaletteRecord.sid:
- retval = new PaletteRecord( in );
- break;
+ return new PaletteRecord( in );
case StringRecord.sid:
- retval = new StringRecord( in );
- break;
+ return new StringRecord( in );
case NameRecord.sid:
- retval = new NameRecord( in );
- break;
+ return new NameRecord( in );
case PaneRecord.sid:
- retval = new PaneRecord( in );
- break;
+ return new PaneRecord( in );
case SharedFormulaRecord.sid:
- retval = new SharedFormulaRecord( in);
- break;
+ return new SharedFormulaRecord( in);
case ObjRecord.sid:
- retval = new ObjRecord( in);
- break;
+ return new ObjRecord( in);
case TextObjectRecord.sid:
- retval = new TextObjectRecord( in);
- break;
+ return new TextObjectRecord( in);
case HorizontalPageBreakRecord.sid:
- retval = new HorizontalPageBreakRecord( in);
- break;
+ return new HorizontalPageBreakRecord( in);
case VerticalPageBreakRecord.sid:
- retval = new VerticalPageBreakRecord( in);
- break;
+ return new VerticalPageBreakRecord( in);
case WriteProtectRecord.sid:
- retval = new WriteProtectRecord( in);
- break;
+ return new WriteProtectRecord( in);
case FilePassRecord.sid:
- retval = new FilePassRecord(in);
- break;
+ return new FilePassRecord(in);
case NoteRecord.sid:
- retval = new NoteRecord( in );
- break;
+ return new NoteRecord( in );
case FileSharingRecord.sid:
- retval = new FileSharingRecord( in );
- break;
+ return new FileSharingRecord( in );
case HyperlinkRecord.sid:
- retval = new HyperlinkRecord( in );
- break;
- default:
- retval = new UnknownRecord( in );
+ return new HyperlinkRecord( in );
}
- return retval;
+ return new UnknownRecord( in );
}
/**
* Method setDump - hex dump out data or not.
- *
- *@param dump
*/
-
public void setDump(boolean dump) {
this.dump = dump;
}
@@ -552,33 +393,44 @@
*
*/
public static void main(String[] args) {
+
+ System.setProperty("poi.deserialize.escher", "true");
+
+ if (args.length == 0) {
+ System.out.println( "Biff viewer needs a filename" );
+ return;
+ }
+
try {
- System.setProperty("poi.deserialize.escher", "true");
+ String inFileName = args[0];
+ File inputFile = new File(inFileName);
+ if(!inputFile.exists()) {
+ throw new RuntimeException("specified inputFile '" + inFileName + "' does not exist");
+ }
+ PrintStream ps;
+ if (false) { // set to true to output to file
+ OutputStream os = new FileOutputStream(inFileName + ".out");
+ ps = new PrintStream(os);
+ } else {
+ ps = System.out;
+ }
+ BiffViewer viewer = new BiffViewer(inputFile, ps);
- if (args.length == 0)
- {
- System.out.println( "Biff viewer needs a filename" );
+ if (args.length > 1 && args[1].equals("on")) {
+ viewer.setDump(true);
}
- else
- {
- BiffViewer viewer = new BiffViewer(args);
- if ((args.length > 1) && args[1].equals("on")) {
- viewer.setDump(true);
- }
- if ((args.length > 1) && args[1].equals("bfd")) {
- POIFSFileSystem fs =
- new POIFSFileSystem(new FileInputStream(args[0]));
- InputStream stream =
- fs.createDocumentInputStream("Workbook");
- int size = stream.available();
- byte[] data = new byte[size];
-
- stream.read(data);
- HexDump.dump(data, 0, System.out, 0);
- } else {
- viewer.run();
- }
+ if (args.length > 1 && args[1].equals("bfd")) {
+ POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(inputFile));
+ InputStream stream = fs.createDocumentInputStream("Workbook");
+ int size = stream.available();
+ byte[] data = new byte[size];
+
+ stream.read(data);
+ HexDump.dump(data, 0, System.out, 0);
+ } else {
+ viewer.run();
}
+ ps.close();
} catch (Exception e) {
e.printStackTrace();
}
@@ -587,7 +439,7 @@
/**
* This record supports dumping of completed continue records.
*/
- static class RecordDetails
+ private static final class RecordDetails
{
short rectype, recsize;
int startloc;
@@ -616,18 +468,19 @@
return record;
}
- public void dump() throws IOException
- {
- dumpNormal(record, startloc, rectype, recsize);
+ public void dump(PrintStream ps) {
+ ps.println("Offset 0x" + Integer.toHexString(startloc) + " (" + startloc + ")");
+ ps.println( "recordid = 0x" + Integer.toHexString( rectype ) + ", size = " + recsize );
+ ps.println( record.toString() );
}
}
- static class BiffviewRecordInputStream extends RecordInputStream {
+ private static final class BiffviewRecordInputStream extends RecordInputStream {
public BiffviewRecordInputStream(InputStream in) {
super(in);
}
- public void dumpBytes() {
- HexDump.dump(this.data, 0, this.currentLength);
+ public void dumpBytes(PrintStream ps) {
+ ps.println(HexDump.dump(this.data, 0, this.currentLength));
}
}
Modified: poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/model/FormulaParser.java
URL: http://svn.apache.org/viewvc/poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/model/FormulaParser.java?rev=657731&r1=657730&r2=657731&view=diff
==============================================================================
--- poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/model/FormulaParser.java (original)
+++ poi/tags/REL_3_1_BETA2/src/java/org/apache/poi/hssf/model/FormulaParser.java Sun May 18 23:35:30 2008
@@ -1000,7 +1000,7 @@
if (ptg instanceof AttrPtg) {
AttrPtg attrPtg = ((AttrPtg) ptg);
- if (attrPtg.isOptimizedIf()) {
+ if (attrPtg.isOptimizedIf() || attrPtg.isOptimizedChoose() || attrPtg.isGoto()) {
continue;
}
if (attrPtg.isSpace()) {
@@ -1014,6 +1014,9 @@
// similar to tAttrSpace - RPN is violated
continue;
}
+ if (!attrPtg.isSum()) {
+ throw new RuntimeException("Unexpected tAttr: " + attrPtg.toString());
+ }
}
final OperationPtg o = (OperationPtg) ptg;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org