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

github-53: fix NPE when iterating over paragraphs in certain *.docx files. Thanks to Praful Kumar Vaishnav! This closes #53.

Browse Source 
https://github.com/apache/poi/pull/53

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1795254 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2017-05-16 00:41:25 +00:00
parent 5c62492ffb
commit fac98b5bef
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
View File

@ -817,14 +817,30 @@ public class XWPFParagraph implements IBodyElement, IRunBody, ISDTContents, Para
* @return boolean - if page break is set
*/
public boolean isPageBreak() {
CTPPr ppr = getCTPPr();
CTOnOff ctPageBreak = ppr.isSetPageBreakBefore() ? ppr
.getPageBreakBefore() : null;
if (ctPageBreak != null
&& ctPageBreak.getVal().intValue() == STOnOff.INT_TRUE) {
return true;
final CTPPr ppr = getCTPPr();
final CTOnOff ctPageBreak = ppr.isSetPageBreakBefore() ? ppr.getPageBreakBefore() : null;
if (ctPageBreak == null) {
return false;
}
return isTruelike(ctPageBreak.getVal(), false);
}
private static boolean isTruelike(final STOnOff.Enum value, boolean defaultValue) {
if (value == null) {
return defaultValue;
}
switch (value.intValue()) {
case STOnOff.INT_TRUE:
case STOnOff.INT_X_1:
case STOnOff.INT_ON:
return true;
case STOnOff.INT_FALSE:
case STOnOff.INT_X_0:
case STOnOff.INT_OFF:
return false;
default:
return defaultValue;
}
return false;
}
/**