Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664219,664221-664489,664494-664514,664516-668013,668015-668142,668144-668152,668154,668156-668256,668258,668260-669139,669141-669455,669457-669657,669659-669808,669810-670189,670191-671321,671323-672229,672231-672549,672551-672552,672554-672561,672563-672566,672568,672571-673049,673051-673852,673854-673862,673864-673986,673988-673996,673998-674347,674349-674890,674892-674910,674912-674936,674938-674952,674954-675078,675080-675085,675087-675217,675219-675660,675662-675670,675672-675716,675718-675726,675728-675733,675735-675775,675777-675782,675784,675786-675791,675794-675852,675854-676200,676202,676204,676206-676220,676222-676309,676311-676456,676458-676994,676996-677027,677030-677040,677042-677056,677058-677375,677377-677968,677970-677971,677973,677975-677994,677996-678286,678288-678538,678540-680393,680395-680469,680471-680529,680531-680852,680854-681529,681531-681571,681573-682224,682226,682228,682231-682281,682283-682335,682337-682507,682509,682512-682517,682519-682532,682534-682677 via svnmerge from
https://svn.apache.org/repos/asf/poi/trunk ........ r682620 | yegor | 2008-08-05 09:05:54 +0100 (Tue, 05 Aug 2008) | 1 line when a new RowRecord is created, the default row height shoud be 0xFF. The DEFAULT_HEIGHT_BIT (0x8000) is optional, some clients like OpenOffice 2.3 and earlier don't understand it ........ r682621 | yegor | 2008-08-05 09:06:50 +0100 (Tue, 05 Aug 2008) | 1 line fixed bug #44692: HSSFPicture.resize() stretched image when there was a text next to it ........ git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@682760 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
b118d1afb9
commit
f8f7dc37cb
@ -53,6 +53,8 @@
|
||||
<action dev="POI-DEVELOPERS" type="add">Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx</action>
|
||||
</release>
|
||||
<release version="3.1.1-alpha1" date="2008-??-??">
|
||||
<action dev="POI-DEVELOPERS" type="fix">45472 - Fixed incorrect default row height in OpenOffice 2.3</action>
|
||||
<action dev="POI-DEVELOPERS" type="fix">44692 - HSSFPicture.resize() stretched image when there was a text next to it</action>
|
||||
<action dev="POI-DEVELOPERS" type="add">45543 - Optionally extract comment text with PowerPointExtractor, and initial hslf model support for comments</action>
|
||||
<action dev="POI-DEVELOPERS" type="fix">45538 - Include excel headers and footers in the output of ExcelExtractor</action>
|
||||
<action dev="POI-DEVELOPERS" type="fix">44894 - refactor duplicate logic from EventRecordFactory to RecordFactory</action>
|
||||
|
@ -46,6 +46,7 @@
|
||||
<li><link href="#Freeform">How to create shapes of arbitrary geometry</link></li>
|
||||
<li><link href="#Graphics2D">Shapes and Graphics2D</link></li>
|
||||
<li><link href="#Render">How to convert slides into images</link></li>
|
||||
<li><link href="#HeadersFooters">Headers / Footers</link></li>
|
||||
</ul>
|
||||
</section>
|
||||
<section><title>Features</title>
|
||||
@ -620,6 +621,48 @@
|
||||
</section>
|
||||
|
||||
</section>
|
||||
<anchor id="HeadersFooters"/>
|
||||
<section><title>How to extract Headers / Footers from an existing presentation</title>
|
||||
<source>
|
||||
|
||||
FileInputStream is = new FileInputStream("slideshow.ppt");
|
||||
SlideShow ppt = new SlideShow(is);
|
||||
is.close();
|
||||
Slide[] slides = ppt.getSlides();
|
||||
|
||||
//presentation-scope headers / footers
|
||||
HeadersFooters hdd = ppt.getSlideHeadersFooters();
|
||||
if(hdd.isFooterVisible()) {
|
||||
String footerText = hdd.getFooterText();
|
||||
}
|
||||
|
||||
//per-slide headers / footers
|
||||
for (int i=0; i < slides.length; i++){
|
||||
HeadersFooters hdd2 = slides[i].getHeadersFooters();
|
||||
if(hdd2.isFooterVisible()) {
|
||||
String footerText = hdd2.getFooterText();
|
||||
}
|
||||
if(hdd2.isUserDateVisible()) {
|
||||
String customDate = hdd2.getDateTimeText();
|
||||
}
|
||||
if(hdd2.isSlideNumberVisible()){
|
||||
int slideNUm = slides[i].getSlideNumber();
|
||||
}
|
||||
|
||||
}
|
||||
</source>
|
||||
</section>
|
||||
<section><title>How to set Headers / Footers</title>
|
||||
<source>
|
||||
|
||||
SlideShow ppt = new SlideShow();
|
||||
|
||||
//presentation-scope headers / footers
|
||||
HeadersFooters hdd = ppt.getSlideHeadersFooters();
|
||||
hdd.setSlideNumberVisible(true);
|
||||
hdd.setFootersText("Created by POI-HSLF");
|
||||
</source>
|
||||
</section>
|
||||
</section>
|
||||
</body>
|
||||
</document>
|
||||
|
@ -50,6 +50,8 @@
|
||||
<action dev="POI-DEVELOPERS" type="add">Created a common interface for handling Excel files, irrespective of if they are .xls or .xlsx</action>
|
||||
</release>
|
||||
<release version="3.1.1-alpha1" date="2008-??-??">
|
||||
<action dev="POI-DEVELOPERS" type="fix">45472 - Fixed incorrect default row height in OpenOffice 2.3</action>
|
||||
<action dev="POI-DEVELOPERS" type="fix">44692 - HSSFPicture.resize() stretched image when there was a text next to it</action>
|
||||
<action dev="POI-DEVELOPERS" type="add">45543 - Optionally extract comment text with PowerPointExtractor, and initial hslf model support for comments</action>
|
||||
<action dev="POI-DEVELOPERS" type="fix">45538 - Include excel headers and footers in the output of ExcelExtractor</action>
|
||||
<action dev="POI-DEVELOPERS" type="fix">44894 - refactor duplicate logic from EventRecordFactory to RecordFactory</action>
|
||||
|
@ -63,8 +63,7 @@ public final class RowRecord extends Record implements Comparable {
|
||||
field_1_row_number = rowNumber;
|
||||
field_2_first_col = -1;
|
||||
field_3_last_col = -1;
|
||||
field_4_height = (short)DEFAULT_HEIGHT_BIT;
|
||||
field_4_height = (short)DEFAULT_HEIGHT_BIT;
|
||||
field_4_height = (short)0xFF;
|
||||
field_5_optimize = ( short ) 0;
|
||||
field_6_reserved = ( short ) 0;
|
||||
field_7_option_flags = OPTION_BITS_ALWAYS_SET; // seems necessary for outlining
|
||||
|
@ -484,7 +484,14 @@ public final class HSSFRow implements Comparable, Row {
|
||||
|
||||
public short getHeight()
|
||||
{
|
||||
return row.getHeight();
|
||||
short height = row.getHeight();
|
||||
|
||||
//The low-order 15 bits contain the row height.
|
||||
//The 0x8000 bit indicates that the row is standard height (optional)
|
||||
if ((height & 0x8000) != 0) height = sheet.getDefaultRowHeight();
|
||||
else height &= 0x7FFF;
|
||||
|
||||
return height;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -494,7 +501,7 @@ public final class HSSFRow implements Comparable, Row {
|
||||
|
||||
public float getHeightInPoints()
|
||||
{
|
||||
return (row.getHeight() / 20);
|
||||
return ((float)getHeight() / 20);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -277,4 +277,29 @@ public final class TestHSSFRow extends TestCase {
|
||||
assertEquals(null, row.getCell(4));
|
||||
assertEquals(HSSFCell.CELL_TYPE_NUMERIC, row.getCell(5).getCellType());
|
||||
}
|
||||
|
||||
public void testRowHeight() {
|
||||
HSSFWorkbook workbook = new HSSFWorkbook();
|
||||
HSSFSheet sheet = workbook.createSheet();
|
||||
HSSFRow row1 = sheet.createRow( (short) 0);
|
||||
|
||||
assertEquals(0xFF, row1.getHeight());
|
||||
assertEquals(sheet.getDefaultRowHeight(), row1.getHeight());
|
||||
|
||||
HSSFRow row2 = sheet.createRow( (short) 1);
|
||||
row2.setHeight((short)400);
|
||||
|
||||
assertEquals(400, row2.getHeight());
|
||||
|
||||
workbook = HSSFTestDataSamples.writeOutAndReadBack(workbook);
|
||||
sheet = workbook.getSheetAt(0);
|
||||
|
||||
row1 = sheet.getRow(0);
|
||||
assertEquals(0xFF, row1.getHeight());
|
||||
assertEquals(sheet.getDefaultRowHeight(), row1.getHeight());
|
||||
|
||||
row2 = sheet.getRow(1);
|
||||
assertEquals(400, row2.getHeight());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -847,8 +847,8 @@ public final class TestHSSFSheet extends TestCase {
|
||||
}
|
||||
assertEquals("Hi Excel!", row.getCell(0).getRichStringCellValue().getString());
|
||||
// check row height for 'default' flag
|
||||
assertEquals((short)0x8000, row.getHeight());
|
||||
|
||||
assertEquals((short)0xFF, row.getHeight());
|
||||
|
||||
HSSFTestDataSamples.writeOutAndReadBack(wb);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user