svn commit: r1832229 - in /poi/trunk/src/ooxml/java/org/apache/poi: xslf/usermodel/XSLFTableCell.java xssf/streaming/SXSSFPicture.java

[kiwiwings]

Author: kiwiwings
Date: Fri May 25 10:20:44 2018
New Revision: 1832229

URL: http://svn.apache.org/viewvc?rev=1832229&view=rev
Log:
sonar fixes

Modified:
    poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
    poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java?rev=1832229&r1=1832228&r2=1832229&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java 
Fri May 25 10:20:44 2018
@@ -268,7 +268,7 @@ public class XSLFTableCell extends XSLFT
     private CTLineProperties setBorderDefaults(BorderEdge edge) {
         final CTLineProperties ln = getCTLine(edge, true);
         if (ln == null) {
-            return null;
+            throw new IllegalStateException("CTLineProperties couldn't be 
initialized");
         }
 
         if (ln.isSetNoFill()) {
@@ -366,6 +366,9 @@ public class XSLFTableCell extends XSLFT
         }
 
         CTLineProperties ln = setBorderDefaults(edge);
+        if (!ln.isSetPrstDash()) {
+            ln.addNewPrstDash();
+        }
         ln.getPrstDash().setVal(STPresetLineDashVal.Enum.forInt(dash.ooxmlId));
     }
 

Modified: 
poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java?rev=1832229&r1=1832228&r2=1832229&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java 
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java 
Fri May 25 10:20:44 2018
@@ -106,6 +106,10 @@ public final class SXSSFPicture implemen
     @Override
     public void resize(double scale){
         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);
 
@@ -139,6 +143,10 @@ public final class SXSSFPicture implemen
      */
     public XSSFClientAnchor getPreferredSize(double scale){
         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();
         Dimension size = getImageDimension(data.getPackagePart(), 
data.getPictureType());



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org