You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/12/01 08:49:04 UTC
svn commit: r1895447 - in /poi/trunk: poi-ooxml-lite-agent/src/main/java9/ poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/ poi-ooxml/src/main/java9/ poi-ooxml/src/test/java9/ poi-scratchpad/src/main/java9/ poi-scratchpad/src/test/java9/ poi/src/...
Author: fanningpj
Date: Wed Dec 1 08:49:03 2021
New Revision: 1895447
URL: http://svn.apache.org/viewvc?rev=1895447&view=rev
Log:
[bug-65715] fix bug in getDrawingPatriarch
Modified:
poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
poi/trunk/poi-ooxml/src/main/java9/module-info.class
poi/trunk/poi-ooxml/src/test/java9/module-info.class
poi/trunk/poi-scratchpad/src/main/java9/module-info.class
poi/trunk/poi-scratchpad/src/test/java9/module-info.class
poi/trunk/poi/src/main/java9/module-info.class
poi/trunk/poi/src/test/java9/module-info.class
Modified: poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml-lite-agent/src/main/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java Wed Dec 1 08:49:03 2021
@@ -524,7 +524,6 @@ public class XSSFSheet extends POIXMLDoc
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 POIXMLDoc
*/
@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 POIXMLDoc
//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
Modified: poi/trunk/poi-ooxml/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-ooxml/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-scratchpad/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/main/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi-scratchpad/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi-scratchpad/src/test/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi/src/main/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
Modified: poi/trunk/poi/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java9/module-info.class?rev=1895447&r1=1895446&r2=1895447&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org