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/11/29 15:35:14 UTC
svn commit: r1895405 - in /poi/trunk/poi-ooxml/src: main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java test/java/org/apache/poi/xslf/TestXSLFBugs.java
Author: fanningpj
Date: Mon Nov 29 15:35:13 2021
New Revision: 1895405
URL: http://svn.apache.org/viewvc?rev=1895405&view=rev
Log:
[bug-65711] Fix overriding relation IDs in importBlip
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java?rev=1895405&r1=1895404&r2=1895405&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java Mon Nov 29 15:35:13 2021
@@ -664,7 +664,7 @@ implements XSLFShapeContainer, Sheet<XSL
pictureData = ppt.addPicture(parData.getData(), parData.getType());
}
- RelationPart rp = addRelation(blipId, XSLFRelation.IMAGES, pictureData);
+ RelationPart rp = addRelation(null, XSLFRelation.IMAGES, pictureData);
return rp.getRelationship().getId();
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java?rev=1895405&r1=1895404&r2=1895405&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java Mon Nov 29 15:35:13 2021
@@ -21,14 +21,7 @@ import static org.apache.poi.sl.draw.Dra
import static org.apache.poi.sl.draw.DrawTextParagraph.HYPERLINK_LABEL;
import static org.apache.poi.xslf.XSLFTestDataSamples.openSampleDocument;
import static org.apache.poi.xslf.XSLFTestDataSamples.writeOutAndReadBack;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import java.awt.Color;
@@ -288,7 +281,7 @@ class TestXSLFBugs {
assertEquals("rId1", rel0.getRelationship().getId());
assertEquals(XSLFRelation.SLIDE_LAYOUT.getRelation(), rel0.getRelationship().getRelationshipType());
RelationPart rel1 = rels.get(1);
- assertEquals("rId2", rel1.getRelationship().getId());
+ assertNotEquals("rId1", rel1.getRelationship().getId());
assertEquals(XSLFRelation.IMAGES.getRelation(), rel1.getRelationship().getRelationshipType());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org