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

Bugzilla 52626: fixed setting default row height in HSSF and XSSF

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1243240 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2012-02-12 11:14:23 +00:00
parent a2722fba8f
commit 39edd2fe62
6 changed files with 23 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/model/InternalSheet.java
View File

@ -1002,6 +1002,8 @@ public final class InternalSheet {
*/ */
public void setDefaultRowHeight(short dch) { public void setDefaultRowHeight(short dch) {
defaultrowheight.setRowHeight(dch); defaultrowheight.setRowHeight(dch);
// set the bit that specifies that the default settings for the row height have been changed.
defaultrowheight.setOptionFlags((short)1);
} }
/** /**

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

@ -197,6 +197,8 @@ public final class HSSFSheet implements org.apache.poi.ss.usermodel.Sheet {
public HSSFRow createRow(int rownum) public HSSFRow createRow(int rownum)
{ {
HSSFRow row = new HSSFRow(_workbook, this, rownum); HSSFRow row = new HSSFRow(_workbook, this, rownum);
// new rows inherit default height from the sheet
row.setHeight(getDefaultRowHeight());
addRow(row, true); addRow(row, true);
return row; return row;

8
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
View File

@ -2060,8 +2060,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
* @param height default row height in twips (1/20 of a point) * @param height default row height in twips (1/20 of a point)
*/ */
public void setDefaultRowHeight(short height) { public void setDefaultRowHeight(short height) {
getSheetTypeSheetFormatPr().setDefaultRowHeight((double)height / 20); setDefaultRowHeightInPoints((float)height / 20);
} }
/** /**
@ -2070,8 +2069,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
* @param height default row height measured in point size. * @param height default row height measured in point size.
*/ */
public void setDefaultRowHeightInPoints(float height) { public void setDefaultRowHeightInPoints(float height) {
getSheetTypeSheetFormatPr().setDefaultRowHeight(height); CTSheetFormatPr pr = getSheetTypeSheetFormatPr();
pr.setDefaultRowHeight(height);
pr.setCustomHeight(true);
} }
/** /**

10
src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
View File

@ -19,6 +19,7 @@
package org.apache.poi.xssf.streaming; package org.apache.poi.xssf.streaming;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.usermodel.BaseTestRow; import org.apache.poi.ss.usermodel.BaseTestRow;
import org.apache.poi.xssf.SXSSFITestDataProvider; import org.apache.poi.xssf.SXSSFITestDataProvider;
@ -30,4 +31,13 @@ public final class TestSXSSFRow extends BaseTestRow {
public TestSXSSFRow() { public TestSXSSFRow() {
super(SXSSFITestDataProvider.instance); super(SXSSFITestDataProvider.instance);
} }
public void testRowBounds() {
baseTestRowBounds(SpreadsheetVersion.EXCEL2007.getLastRowIndex());
}
public void testCellBounds() {
baseTestCellBounds(SpreadsheetVersion.EXCEL2007.getLastColumnIndex());
}
} }

1
src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
View File

@ -292,6 +292,7 @@ public abstract class BaseTestRow extends TestCase {
assertEquals(20*20, row1.getHeight()); assertEquals(20*20, row1.getHeight());
Row row2 = sheet.createRow(1); Row row2 = sheet.createRow(1);
assertEquals(sheet.getDefaultRowHeight(), row2.getHeight());
row2.setHeight((short)310); row2.setHeight((short)310);
assertEquals(310, row2.getHeight()); assertEquals(310, row2.getHeight());
assertEquals(310F/20, row2.getHeightInPoints(), 0F); assertEquals(310F/20, row2.getHeightInPoints(), 0F);

4
src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
View File

@ -401,6 +401,10 @@ public abstract class BaseTestSheet extends TestCase {
assertEquals((short) 300, sheet.getDefaultRowHeight()); assertEquals((short) 300, sheet.getDefaultRowHeight());
assertEquals(15.0F, sheet.getDefaultRowHeightInPoints(), 0F); assertEquals(15.0F, sheet.getDefaultRowHeightInPoints(), 0F);
Row row = sheet.createRow(1);
// new row inherits default height from the sheet
assertEquals(sheet.getDefaultRowHeight(), row.getHeight());
// Set a new default row height in twips and test getting the value in points // Set a new default row height in twips and test getting the value in points
sheet.setDefaultRowHeight((short) 360); sheet.setDefaultRowHeight((short) 360);
assertEquals(18.0f, sheet.getDefaultRowHeightInPoints(), 0F); assertEquals(18.0f, sheet.getDefaultRowHeightInPoints(), 0F);