From 84798ced36df236e9ada78ead7e5bffa2a5dd638 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Mon, 29 Nov 2021 15:35:13 +0000 Subject: [PATCH] [bug-65711] Fix overriding relation IDs in importBlip git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1895405 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/xslf/usermodel/XSLFSheet.java | 2 +- .../test/java/org/apache/poi/xslf/TestXSLFBugs.java | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java index c34d8f3800..d9879e3637 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java @@ -664,7 +664,7 @@ implements XSLFShapeContainer, Sheet { 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(); } diff --git a/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java index ea77de2ba0..de527e0385 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java @@ -21,14 +21,7 @@ import static org.apache.poi.sl.draw.DrawTextParagraph.HYPERLINK_HREF; 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()); } } -- 2.39.5