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

Have autoSizeColumn skip over merged regions - bug #43902. Patch from Paolo

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@610328 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2008-01-09 09:55:20 +00:00
parent c0bab46840
commit 9c2787efb4
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1615,7 +1615,13 @@ public class HSSFSheet
for (Iterator it = rowIterator(); it.hasNext();) { for (Iterator it = rowIterator(); it.hasNext();) {
HSSFRow row = (HSSFRow) it.next(); HSSFRow row = (HSSFRow) it.next();
HSSFCell cell = row.getCell(column); HSSFCell cell = row.getCell(column);
if (cell == null) continue;
boolean isCellInMergedRegion = false;
for (int i = 0 ; i < getNumMergedRegions() && ! isCellInMergedRegion; i++) {
isCellInMergedRegion = getMergedRegionAt(i).contains(row.getRowNum(), column);
}
if (cell == null | isCellInMergedRegion) continue;
HSSFCellStyle style = cell.getCellStyle(); HSSFCellStyle style = cell.getCellStyle();
HSSFFont font = wb.getFontAt(style.getFontIndex()); HSSFFont font = wb.getFontAt(style.getFontIndex());

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

Binary file not shown.

39
src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
View File

@ -32,6 +32,7 @@ import org.apache.poi.hssf.record.VCenterRecord;
import org.apache.poi.hssf.record.WSBoolRecord; import org.apache.poi.hssf.record.WSBoolRecord;
import org.apache.poi.hssf.record.WindowTwoRecord; import org.apache.poi.hssf.record.WindowTwoRecord;
import org.apache.poi.hssf.util.Region; import org.apache.poi.hssf.util.Region;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.TempFile; import org.apache.poi.util.TempFile;
/** /**
@ -614,6 +615,44 @@ public class TestHSSFSheet
workbook = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray())); workbook = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
assertTrue("No Exceptions while reading file", true); assertTrue("No Exceptions while reading file", true);
}
public void testAutoSizeColumn() throws Exception {
String filename = System.getProperty("HSSF.testdata.path");
filename = filename + "/43902.xls";
String sheetName = "my sheet";
FileInputStream is = new FileInputStream(filename);
POIFSFileSystem fs = new POIFSFileSystem(is);
HSSFWorkbook wb = new HSSFWorkbook(fs);
HSSFSheet sheet = wb.getSheet(sheetName);
// autoSize the first column and check its size before the merged region (1,0,1,1) is set:
// it has to be based on the 2nd row width
sheet.autoSizeColumn((short)0);
assertEquals("Column autosized with only one row: wrong width", (short)7169, sheet.getColumnWidth((short)0));
//create a region over the 2nd row and auto size the first column
sheet.addMergedRegion(new Region(1,(short)0,1,(short)1));
sheet.autoSizeColumn((short)0);
ByteArrayOutputStream out = new ByteArrayOutputStream();
wb.write(out);
out.close();
// check that the autoSized column width has ignored the 2nd row
// because it is included in a merged region (Excel like behavior)
HSSFWorkbook wb2 = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
HSSFSheet sheet2 = wb2.getSheet(sheetName);
assertEquals((short)3024, sheet2.getColumnWidth((short)0));
// remove the 2nd row merged region and check that the 2nd row value is used to the autoSizeColumn width
sheet2.removeMergedRegion(1);
sheet2.autoSizeColumn((short)0);
out = new ByteArrayOutputStream();
wb2.write(out);
out.close();
HSSFWorkbook wb3 = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
HSSFSheet sheet3 = wb3.getSheet(sheetName);
assertEquals((short)7169, sheet3.getColumnWidth((short)0));
} }
public static void main(java.lang.String[] args) { public static void main(java.lang.String[] args) {