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:
parent
cb4c63a2bc
commit
5ceb0327e5
|
@ -37,6 +37,7 @@
|
||||||
|
|
||||||
<!-- Don't forget to update status.xml too! -->
|
<!-- Don't forget to update status.xml too! -->
|
||||||
<release version="3.2-alpha1" date="2008-??-??">
|
<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="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="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>
|
<action dev="POI-DEVELOPERS" type="fix">45829 - HSSFPicture.getImageDimension() failed when DPI of image is zero</action>
|
||||||
|
|
|
@ -34,6 +34,7 @@
|
||||||
<!-- Don't forget to update changes.xml too! -->
|
<!-- Don't forget to update changes.xml too! -->
|
||||||
<changes>
|
<changes>
|
||||||
<release version="3.2-alpha1" date="2008-??-??">
|
<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="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="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>
|
<action dev="POI-DEVELOPERS" type="fix">45829 - HSSFPicture.getImageDimension() failed when DPI of image is zero</action>
|
||||||
|
|
|
@ -75,7 +75,8 @@ public class SeriesTextRecord
|
||||||
field_1_id = in.readShort();
|
field_1_id = in.readShort();
|
||||||
field_2_textLength = in.readByte();
|
field_2_textLength = in.readByte();
|
||||||
field_3_undocumented = 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()
|
public String toString()
|
||||||
|
@ -163,18 +164,34 @@ public class SeriesTextRecord
|
||||||
/**
|
/**
|
||||||
* Get the text length field for the SeriesText record.
|
* 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.
|
* Set the text length field for the SeriesText record.
|
||||||
|
* Needs to be wrapped.
|
||||||
*/
|
*/
|
||||||
public void setTextLength(byte field_2_textLength)
|
public void setTextLength(byte field_2_textLength)
|
||||||
{
|
{
|
||||||
this.field_2_textLength = 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.
|
* Get the undocumented field for the SeriesText record.
|
||||||
|
|
Binary file not shown.
|
@ -1474,4 +1474,14 @@ public final class TestBugs extends TestCase {
|
||||||
fail();
|
fail();
|
||||||
} catch(IllegalArgumentException e) {}
|
} catch(IllegalArgumentException e) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Charts with long titles
|
||||||
|
*/
|
||||||
|
public void test45784() {
|
||||||
|
// This used to break
|
||||||
|
HSSFWorkbook wb = openSample("45784.xls");
|
||||||
|
assertEquals(1, wb.getNumberOfSheets());
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue