Attachment #38108 for bug #65711

View | Details | Raw Unified | Return to bug 65711
Collapse All | Expand All




import java.io.IOException;
import java.util.List;

import org.apache.poi.sl.usermodel.PictureData;
import org.apache.poi.xslf.XSLFTestDataSamples;
import org.junit.jupiter.api.Test;


        ppt.close();
        ppt2.close();
    }

    @Test
    void testImportBlip() {
        XMLSlideShow ppt = new XMLSlideShow();

        XSLFSlide sourceSlide1 = ppt.createSlide();
        XSLFSlide sourceSlide2 = ppt.createSlide();

        XSLFSlide targetSlide = ppt.createSlide();

        XSLFPictureShape sourcePictureShape1 = sourceSlide1.createPicture(ppt.addPicture(new byte[1], PictureData.PictureType.JPEG));
        XSLFPictureShape sourcePictureShape2 = sourceSlide2.createPicture(ppt.addPicture(new byte[2], PictureData.PictureType.JPEG));

        String sourceRelationId1 = sourceSlide1.getRelationId(sourcePictureShape1.getPictureData());
        String sourceRelationId2 = sourceSlide2.getRelationId(sourcePictureShape2.getPictureData());

        String targetRelationId1 = targetSlide.importBlip(sourceRelationId1, sourceSlide1);
        String targetRelationId2 = targetSlide.importBlip(sourceRelationId2, sourceSlide2);

        assertNotEquals(targetRelationId1, targetRelationId2);
    }

}

Lines 664-670 Link Here

(-)a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java (-1 / +1 lines)
664	pictureData = ppt.addPicture(parData.getData(), parData.getType());	664	pictureData = ppt.addPicture(parData.getData(), parData.getType());
665	}	665	}
666		666
667	RelationPart rp = addRelation(blipId, XSLFRelation.IMAGES, pictureData);	667	RelationPart rp = addRelation(null, XSLFRelation.IMAGES, pictureData);
668	return rp.getRelationship().getId();	668	return rp.getRelationship().getId();
669	}	669	}
670		670

Return to bug 65711

Lines 21-26 Link Here

(-)a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java (+23 lines)
21	import java.io.IOException;	21	import java.io.IOException;
22	import java.util.List;	22	import java.util.List;
23		23
		24	import org.apache.poi.sl.usermodel.PictureData;
24	import org.apache.poi.xslf.XSLFTestDataSamples;	25	import org.apache.poi.xslf.XSLFTestDataSamples;
25	import org.junit.jupiter.api.Test;	26	import org.junit.jupiter.api.Test;
26		27
Lines 70-73 Link Here
70	ppt.close();	71	ppt.close();
71	ppt2.close();	72	ppt2.close();
72	}	73	}
		74
		75	@Test
		76	void testImportBlip() {
		77	XMLSlideShow ppt = new XMLSlideShow();
		78
		79	XSLFSlide sourceSlide1 = ppt.createSlide();
		80	XSLFSlide sourceSlide2 = ppt.createSlide();
		81
		82	XSLFSlide targetSlide = ppt.createSlide();
		83
		84	XSLFPictureShape sourcePictureShape1 = sourceSlide1.createPicture(ppt.addPicture(new byte[1], PictureData.PictureType.JPEG));
		85	XSLFPictureShape sourcePictureShape2 = sourceSlide2.createPicture(ppt.addPicture(new byte[2], PictureData.PictureType.JPEG));
		86
		87	String sourceRelationId1 = sourceSlide1.getRelationId(sourcePictureShape1.getPictureData());
		88	String sourceRelationId2 = sourceSlide2.getRelationId(sourcePictureShape2.getPictureData());
		89
		90	String targetRelationId1 = targetSlide.importBlip(sourceRelationId1, sourceSlide1);
		91	String targetRelationId2 = targetSlide.importBlip(sourceRelationId2, sourceSlide2);
		92
		93	assertNotEquals(targetRelationId1, targetRelationId2);
		94	}
		95
73	}	96	}