Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sonar fixes 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1832229 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andreas Beeker 2018-05-25 10:20:44 +00:00
parent e345646b9f
commit 4c95bc3372
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
View File

@ -268,7 +268,7 @@ public class XSLFTableCell extends XSLFTextShape implements TableCell<XSLFShape,
private CTLineProperties setBorderDefaults(BorderEdge edge) { private CTLineProperties setBorderDefaults(BorderEdge edge) {
final CTLineProperties ln = getCTLine(edge, true); final CTLineProperties ln = getCTLine(edge, true);
if (ln == null) { if (ln == null) {
return null; throw new IllegalStateException("CTLineProperties couldn't be initialized");
} }
if (ln.isSetNoFill()) { if (ln.isSetNoFill()) {
@ -366,6 +366,9 @@ public class XSLFTableCell extends XSLFTextShape implements TableCell<XSLFShape,
} }
CTLineProperties ln = setBorderDefaults(edge); CTLineProperties ln = setBorderDefaults(edge);
if (!ln.isSetPrstDash()) {
ln.addNewPrstDash();
}
ln.getPrstDash().setVal(STPresetLineDashVal.Enum.forInt(dash.ooxmlId)); ln.getPrstDash().setVal(STPresetLineDashVal.Enum.forInt(dash.ooxmlId));
} }

8
src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
View File

@ -106,6 +106,10 @@ public final class SXSSFPicture implements Picture {
@Override @Override
public void resize(double scale){ public void resize(double scale){
XSSFClientAnchor anchor = getClientAnchor(); XSSFClientAnchor anchor = getClientAnchor();
if (anchor == null) {
logger.log(POILogger.WARN, "picture is not anchored via client anchor - ignoring resize call");
return;
}
XSSFClientAnchor pref = getPreferredSize(scale); XSSFClientAnchor pref = getPreferredSize(scale);
@ -139,6 +143,10 @@ public final class SXSSFPicture implements Picture {
*/ */
public XSSFClientAnchor getPreferredSize(double scale){ public XSSFClientAnchor getPreferredSize(double scale){
XSSFClientAnchor anchor = getClientAnchor(); XSSFClientAnchor anchor = getClientAnchor();
if (anchor == null) {
logger.log(POILogger.WARN, "picture is not anchored via client anchor - ignoring resize call");
return null;
}
XSSFPictureData data = getPictureData(); XSSFPictureData data = getPictureData();
Dimension size = getImageDimension(data.getPackagePart(), data.getPictureType()); Dimension size = getImageDimension(data.getPackagePart(), data.getPictureType());