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

POI 59030 fix NPE in XWPFTableCell's getVerticalAlignment via Prasad Babu

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1731257 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Tim Allison 2016-02-19 15:46:26 +00:00
parent 2cab09db04
commit bc716a2796
3 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
View File

@ -227,15 +227,18 @@ public class XWPFTableCell implements IBody, ICell {
/** /**
* Get the vertical alignment of the cell. * Get the vertical alignment of the cell.
* *
* @return the cell alignment enum value * @return the cell alignment enum value or <code>null</code>
* if no vertical alignment is set.
*/ */
public XWPFVertAlign getVerticalAlignment() { public XWPFVertAlign getVerticalAlignment() {
XWPFVertAlign vAlign = null; XWPFVertAlign vAlign = null;
CTTcPr tcpr = ctTc.getTcPr(); CTTcPr tcpr = ctTc.getTcPr();
if (tcpr != null) { if (tcpr != null) {
CTVerticalJc va = tcpr.getVAlign(); CTVerticalJc va = tcpr.getVAlign();
if (va != null && va.getVal() != null) {
vAlign = stVertAlignTypeMap.get(va.getVal().intValue()); vAlign = stVertAlignTypeMap.get(va.getVal().intValue());
} }
}
return vAlign; return vAlign;
} }

19
src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
View File

@ -19,8 +19,11 @@
package org.apache.poi.xwpf.usermodel; package org.apache.poi.xwpf.usermodel;
import java.util.List;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.xwpf.XWPFTestDataSamples;
import org.apache.poi.xwpf.usermodel.XWPFTableCell.XWPFVertAlign; import org.apache.poi.xwpf.usermodel.XWPFTableCell.XWPFVertAlign;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHMerge; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHMerge;
import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd;
@ -103,4 +106,20 @@ public class TestXWPFTableCell extends TestCase {
CTTcBorders tblBorders = tcPr.addNewTcBorders(); CTTcBorders tblBorders = tcPr.addNewTcBorders();
CTVMerge vMerge = tcPr.addNewVMerge(); CTVMerge vMerge = tcPr.addNewVMerge();
} }
public void testCellVerticalAlign() throws Exception{
XWPFDocument docx = XWPFTestDataSamples.openSampleDocument("59030.docx");
List<XWPFTable> tables = docx.getTables();
assertEquals(1, tables.size());
XWPFTable table = tables.get(0);
List<XWPFTableRow> tableRows = table.getRows();
assertEquals(2, tableRows.size());
assertNull(tableRows.get(0).getCell(0).getVerticalAlignment());
assertEquals(XWPFVertAlign.BOTTOM, tableRows.get(0).getCell(1).getVerticalAlignment());
assertEquals(XWPFVertAlign.CENTER, tableRows.get(1).getCell(0).getVerticalAlignment());
assertNull(tableRows.get(1).getCell(1).getVerticalAlignment());
}
} }

BIN
test-data/document/59030.docx Normal file
View File

Binary file not shown.