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

Fix bug #45784 - Support long chart titles in SeriesTextRecords 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@697562 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2008-09-21 17:49:20 +00:00
parent cb4c63a2bc
commit 5ceb0327e5
5 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/documentation/content/xdocs/changes.xml
View File

@ -37,6 +37,7 @@
<!-- Don't forget to update status.xml too! -->
<release version="3.2-alpha1" date="2008-??-??">
<action dev="POI-DEVELOPERS" type="fix">45784 - Support long chart titles in SeriesTextRecords</action>
<action dev="POI-DEVELOPERS" type="fix">45777 - Throw an exception if HSSF Footer or Header is attemped to be set too long, rather than having it break during writing out</action>
<action dev="POI-DEVELOPERS" type="add">45844 - Addtional diagnostics for HSLF SlideShowRecordDumper</action>
<action dev="POI-DEVELOPERS" type="fix">45829 - HSSFPicture.getImageDimension() failed when DPI of image is zero</action>

1
src/documentation/content/xdocs/status.xml
View File

@ -34,6 +34,7 @@
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.2-alpha1" date="2008-??-??">
<action dev="POI-DEVELOPERS" type="fix">45784 - Support long chart titles in SeriesTextRecords</action>
<action dev="POI-DEVELOPERS" type="fix">45777 - Throw an exception if HSSF Footer or Header is attemped to be set too long, rather than having it break during writing out</action>
<action dev="POI-DEVELOPERS" type="add">45844 - Addtional diagnostics for HSLF SlideShowRecordDumper</action>
<action dev="POI-DEVELOPERS" type="fix">45829 - HSSFPicture.getImageDimension() failed when DPI of image is zero</action>

23
src/java/org/apache/poi/hssf/record/SeriesTextRecord.java
View File

@ -75,7 +75,8 @@ public class SeriesTextRecord
field_1_id = in.readShort();
field_2_textLength = in.readByte();
field_3_undocumented = in.readByte();
field_4_text = in.readUnicodeLEString(field_2_textLength);
field_4_text = in.readUnicodeLEString(
LittleEndian.ubyteToInt(field_2_textLength));
}
public String toString()
@ -163,18 +164,34 @@ public class SeriesTextRecord
/**
* Get the text length field for the SeriesText record.
*/
public byte getTextLength()
public int getTextLength()
{
return field_2_textLength;
return LittleEndian.ubyteToInt(field_2_textLength);
}
/**
* Set the text length field for the SeriesText record.
* Needs to be wrapped.
*/
public void setTextLength(byte field_2_textLength)
{
this.field_2_textLength = field_2_textLength;
}
/**
* Set the text length field for the SeriesText record.
*/
public void setTextLength(int field_2_textLength)
{
if(field_2_textLength > 255) {
throw new IllegalArgumentException("Length must be 0-255");
}
if(field_2_textLength > 127) {
this.field_2_textLength = (byte)
(field_2_textLength-256);
} else {
this.field_2_textLength = (byte)field_2_textLength;
}
}
/**
* Get the undocumented field for the SeriesText record.

BIN
src/testcases/org/apache/poi/hssf/data/45784.xls Normal file
View File

Binary file not shown.

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

@ -1474,4 +1474,14 @@ public final class TestBugs extends TestCase {
fail();
} catch(IllegalArgumentException e) {}
}
/**
* Charts with long titles
*/
public void test45784() {
// This used to break
HSSFWorkbook wb = openSample("45784.xls");
assertEquals(1, wb.getNumberOfSheets());
}
}