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

Enable CFRule12 use #58130

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1690783 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2015-07-13 18:09:12 +00:00
parent 010e67c749
commit 72f0f10882
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/hssf/dev/BiffViewer.java
View File

@ -179,6 +179,8 @@ public final class BiffViewer {
case CFHeaderRecord.sid: return new CFHeaderRecord(in); case CFHeaderRecord.sid: return new CFHeaderRecord(in);
case CFHeader12Record.sid: return new CFHeader12Record(in); case CFHeader12Record.sid: return new CFHeader12Record(in);
case CFRuleRecord.sid: return new CFRuleRecord(in); case CFRuleRecord.sid: return new CFRuleRecord(in);
case CFRule12Record.sid: return new CFRule12Record(in);
// TODO Add CF Ex, and remove from UnknownRecord
case CalcCountRecord.sid: return new CalcCountRecord(in); case CalcCountRecord.sid: return new CalcCountRecord(in);
case CalcModeRecord.sid: return new CalcModeRecord(in); case CalcModeRecord.sid: return new CalcModeRecord(in);
case CategorySeriesAxisRecord.sid:return new CategorySeriesAxisRecord(in); case CategorySeriesAxisRecord.sid:return new CategorySeriesAxisRecord(in);

2
src/java/org/apache/poi/hssf/record/CFRuleBase.java
View File

@ -347,7 +347,7 @@ public abstract class CFRuleBase extends StandardRecord {
} }
protected int getFormattingBlockSize() { protected int getFormattingBlockSize() {
return return 6 +
(containsFontFormattingBlock()?_fontFormatting.getRawRecord().length:0)+ (containsFontFormattingBlock()?_fontFormatting.getRawRecord().length:0)+
(containsBorderFormattingBlock()?8:0)+ (containsBorderFormattingBlock()?8:0)+
(containsPatternFormattingBlock()?4:0); (containsPatternFormattingBlock()?4:0);

2
src/java/org/apache/poi/hssf/record/CFRuleRecord.java
View File

@ -114,7 +114,7 @@ public final class CFRuleRecord extends CFRuleBase {
} }
protected int getDataSize() { protected int getDataSize() {
return 12 + getFormattingBlockSize() + return 6 + getFormattingBlockSize() +
getFormulaSize(getFormula1())+ getFormulaSize(getFormula1())+
getFormulaSize(getFormula2()); getFormulaSize(getFormula2());
} }

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

@ -151,6 +151,7 @@ public final class RecordFactory {
CFHeaderRecord.class, CFHeaderRecord.class,
CFHeader12Record.class, CFHeader12Record.class,
CFRuleRecord.class, CFRuleRecord.class,
CFRule12Record.class,
ChartRecord.class, ChartRecord.class,
ChartTitleFormatRecord.class, ChartTitleFormatRecord.class,
CodepageRecord.class, CodepageRecord.class,

3
src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
View File

@ -402,8 +402,7 @@ public final class TestCFRuleRecord extends TestCase {
assertArrayEquals(serializedRecord, serializedClone); assertArrayEquals(serializedRecord, serializedClone);
} }
// TODO Fix this test! public void testBug57231_rewrite() {
public void IGNORED_testBug57231_rewrite() {
HSSFWorkbook wb = HSSFITestDataProvider.instance.openSampleWorkbook("57231_MixedGasReport.xls"); HSSFWorkbook wb = HSSFITestDataProvider.instance.openSampleWorkbook("57231_MixedGasReport.xls");
assertEquals(7, wb.getNumberOfSheets()); assertEquals(7, wb.getNumberOfSheets());
wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb); wb = HSSFITestDataProvider.instance.writeOutAndReadBack(wb);