aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--poi-ooxml-lite-agent/src/main/java9/module-info.classbin279 -> 278 bytes
-rw-r--r--poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java9
-rw-r--r--poi-ooxml/src/main/java9/module-info.classbin3840 -> 3841 bytes
-rw-r--r--poi-ooxml/src/test/java9/module-info.classbin5227 -> 5228 bytes
-rw-r--r--poi-scratchpad/src/main/java9/module-info.classbin2695 -> 2696 bytes
-rw-r--r--poi-scratchpad/src/test/java9/module-info.classbin3342 -> 3343 bytes
-rw-r--r--poi/src/main/java9/module-info.classbin3421 -> 3386 bytes
-rw-r--r--poi/src/test/java9/module-info.classbin4199 -> 4198 bytes
8 files changed, 4 insertions, 5 deletions
diff --git a/poi-ooxml-lite-agent/src/main/java9/module-info.class b/poi-ooxml-lite-agent/src/main/java9/module-info.class
index 8b45606400..13840f12cc 100644
--- a/poi-ooxml-lite-agent/src/main/java9/module-info.class
+++ b/poi-ooxml-lite-agent/src/main/java9/module-info.class
Binary files differ
diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 9f5a9addac..dfb586c325 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -524,7 +524,6 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
if (drId.equals(ctDrawing.getId())){
return dr;
}
- break;
}
}
LOG.atError().log("Can't find drawing with id={} in the list of the sheet's relationships", ctDrawing.getId());
@@ -539,9 +538,9 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
*/
@Override
public XSSFDrawing createDrawingPatriarch() {
- CTDrawing ctDrawing = getCTDrawing();
- if (ctDrawing != null) {
- return getDrawingPatriarch();
+ XSSFDrawing existingDrawing = getDrawingPatriarch();
+ if (existingDrawing != null) {
+ return existingDrawing;
}
// Default drawingNumber = #drawings.size() + 1
@@ -553,7 +552,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
//add CT_Drawing element which indicates that this sheet contains drawing components built on the drawingML platform.
//The relationship Id references the part containing the drawingML definitions.
- ctDrawing = worksheet.addNewDrawing();
+ CTDrawing ctDrawing = worksheet.addNewDrawing();
ctDrawing.setId(relId);
// Return the newly created drawing
diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
index d79f2de643..6b3411cb4d 100644
--- a/poi-ooxml/src/main/java9/module-info.class
+++ b/poi-ooxml/src/main/java9/module-info.class
Binary files differ
diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
index 75444a4c92..62e9c00111 100644
--- a/poi-ooxml/src/test/java9/module-info.class
+++ b/poi-ooxml/src/test/java9/module-info.class
Binary files differ
diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
index 1c076d2f61..1e8a22e529 100644
--- a/poi-scratchpad/src/main/java9/module-info.class
+++ b/poi-scratchpad/src/main/java9/module-info.class
Binary files differ
diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
index 91bc9fc6b8..5e9f24ad13 100644
--- a/poi-scratchpad/src/test/java9/module-info.class
+++ b/poi-scratchpad/src/test/java9/module-info.class
Binary files differ
diff --git a/poi/src/main/java9/module-info.class b/poi/src/main/java9/module-info.class
index 7ca4ecd882..e6ce06b6d3 100644
--- a/poi/src/main/java9/module-info.class
+++ b/poi/src/main/java9/module-info.class
Binary files differ
diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class
index 141c7946b5..c07ff8f76b 100644
--- a/poi/src/test/java9/module-info.class
+++ b/poi/src/test/java9/module-info.class
Binary files differ