moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

records.UnicodeString isn't actually a Record, just a common part that exists in many other records. As such, move it to records.common, which is where all the other record components live 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@900362 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2010-01-18 12:18:00 +00:00
parent a52cd3e05a
commit 6605995ac6
16 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/hssf/model/InternalWorkbook.java
View File

@ -71,12 +71,12 @@ import org.apache.poi.hssf.record.SSTRecord;
import org.apache.poi.hssf.record.StyleRecord;
import org.apache.poi.hssf.record.SupBookRecord;
import org.apache.poi.hssf.record.TabIdRecord;
import org.apache.poi.hssf.record.UnicodeString;
import org.apache.poi.hssf.record.UseSelFSRecord;
import org.apache.poi.hssf.record.WindowOneRecord;
import org.apache.poi.hssf.record.WindowProtectRecord;
import org.apache.poi.hssf.record.WriteAccessRecord;
import org.apache.poi.hssf.record.WriteProtectRecord;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.formula.NameXPtg;
import org.apache.poi.hssf.record.formula.FormulaShifter;
import org.apache.poi.hssf.record.formula.Ptg;

1
src/java/org/apache/poi/hssf/record/DVRecord.java
View File

@ -17,6 +17,7 @@
package org.apache.poi.hssf.record;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.formula.Ptg;
import org.apache.poi.hssf.usermodel.HSSFDataValidation;
import org.apache.poi.ss.formula.Formula;

1
src/java/org/apache/poi/hssf/record/SSTDeserializer.java
View File

@ -19,6 +19,7 @@
package org.apache.poi.hssf.record;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.util.IntMapper;
/**

1
src/java/org/apache/poi/hssf/record/SSTRecord.java
View File

@ -19,6 +19,7 @@ package org.apache.poi.hssf.record;
import java.util.Iterator;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.cont.ContinuableRecord;
import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
import org.apache.poi.util.IntMapper;

1
src/java/org/apache/poi/hssf/record/SSTSerializer.java
View File

@ -17,6 +17,7 @@
package org.apache.poi.hssf.record;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
import org.apache.poi.util.IntMapper;

3
src/java/org/apache/poi/hssf/record/UnicodeString.java → src/java/org/apache/poi/hssf/record/common/UnicodeString.java
View File

@ -15,13 +15,14 @@
limitations under the License.
==================================================================== */
package org.apache.poi.hssf.record;
package org.apache.poi.hssf.record.common;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;

2
src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
View File

@ -41,8 +41,8 @@ import org.apache.poi.hssf.record.Record;
import org.apache.poi.hssf.record.RecordBase;
import org.apache.poi.hssf.record.SubRecord;
import org.apache.poi.hssf.record.TextObjectRecord;
import org.apache.poi.hssf.record.UnicodeString;
import org.apache.poi.hssf.record.aggregates.FormulaRecordAggregate;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.formula.ExpPtg;
import org.apache.poi.hssf.record.formula.Ptg;
import org.apache.poi.hssf.record.formula.eval.ErrorEval;

2
src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
View File

@ -21,7 +21,7 @@ import java.util.Iterator;
import org.apache.poi.hssf.record.ExtendedFormatRecord;
import org.apache.poi.hssf.record.FontRecord;
import org.apache.poi.hssf.record.UnicodeString;
import org.apache.poi.hssf.record.common.UnicodeString;
/**
* Excel can get cranky if you give it files containing too

2
src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
View File

@ -21,7 +21,7 @@ import java.util.Iterator;
import org.apache.poi.hssf.model.InternalWorkbook;
import org.apache.poi.hssf.record.LabelSSTRecord;
import org.apache.poi.hssf.record.UnicodeString;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.RichTextString;
/**

2
src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
View File

@ -52,9 +52,9 @@ import org.apache.poi.hssf.record.ObjRecord;
import org.apache.poi.hssf.record.Record;
import org.apache.poi.hssf.record.RecordFactory;
import org.apache.poi.hssf.record.SSTRecord;
import org.apache.poi.hssf.record.UnicodeString;
import org.apache.poi.hssf.record.UnknownRecord;
import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.formula.Area3DPtg;
import org.apache.poi.hssf.record.formula.MemFuncPtg;
import org.apache.poi.hssf.record.formula.NameXPtg;

2
src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
View File

@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.record.NameRecord;
import org.apache.poi.hssf.record.UnicodeString;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.constant.ErrorConstant;
import org.apache.poi.hssf.record.formula.AbstractFunctionPtg;
import org.apache.poi.hssf.record.formula.AddPtg;

1
src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
View File

@ -23,6 +23,7 @@ import junit.framework.TestSuite;
import org.apache.poi.hssf.record.aggregates.AllRecordAggregateTests;
import org.apache.poi.hssf.record.cf.TestCellRange;
import org.apache.poi.hssf.record.chart.AllChartRecordTests;
import org.apache.poi.hssf.record.common.TestUnicodeString;
import org.apache.poi.hssf.record.constant.TestConstantValueParser;
import org.apache.poi.hssf.record.crypto.AllHSSFEncryptionTests;
import org.apache.poi.hssf.record.formula.AllFormulaTests;

1
src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
View File

@ -30,6 +30,7 @@ import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.HexRead;

1
src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
View File

@ -19,6 +19,7 @@ package org.apache.poi.hssf.record;
import junit.framework.TestCase;
import org.apache.poi.hssf.record.common.UnicodeString;
import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
import org.apache.poi.util.IntMapper;

5
src/testcases/org/apache/poi/hssf/record/TestUnicodeString.java → src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
View File

@ -15,10 +15,13 @@
limitations under the License.
==================================================================== */
package org.apache.poi.hssf.record;
package org.apache.poi.hssf.record.common;
import junit.framework.TestCase;
import org.apache.poi.hssf.record.ContinueRecord;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
import org.apache.poi.hssf.record.cont.ContinuableRecordOutput;
/**

10
src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
View File

@ -1536,4 +1536,14 @@ public final class TestBugs extends BaseTestBugzillaIssues {
public void test47251() {
openSample("47251.xls");
}
/**
* Round trip a file with an unusual ExtRst record
*/
public void test47847() {
HSSFWorkbook wb = openSample("47251.xls");
assertEquals(1, wb.getNumberOfSheets());
wb = writeOutAndReadBack(wb);
assertEquals(1, wb.getNumberOfSheets());
}
}