This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new b66bb9a133 XDDF: pick a free part name for the embedded workbook of a
new chart (#1564)
b66bb9a133 is described below
commit b66bb9a133c6c8cce51829f0fe8a71368a9ffbb6
Author: ZIHAN DAI <[email protected]>
AuthorDate: Wed Nov 11 17:25:51 2026 +1100
XDDF: pick a free part name for the embedded workbook of a new chart (#1564)
A new chart stored its data in an embedded workbook named after the
chart index, e.g. /ppt/embeddings/Microsoft_Excel_Worksheet1.xlsx for
chart1.xml. The chart index only avoids existing chart parts, so when
the document already had an embedded workbook with that name, such as
an embedded Excel object, writing the document failed with
PartAlreadyExistsException.
Use the next free index, starting at the chart index, for the workbook
part.
Fixes #1002
---
.../apache/poi/xddf/usermodel/chart/XDDFChart.java | 4 ++-
.../apache/poi/xslf/usermodel/TestXSLFChart.java | 41 ++++++++++++++++++++++
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
index be4d7ac56c..810b8940ab 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
@@ -750,7 +750,9 @@ public abstract class XDDFChart extends POIXMLDocumentPart
implements TextContai
*/
private PackagePart createWorksheetPart(POIXMLRelation
chartWorkbookRelation, POIXMLFactory chartFactory)
throws InvalidFormatException {
- PackageRelationship xlsx =
createRelationshipInChart(chartWorkbookRelation, chartFactory, chartIndex);
+ // the document can already contain an embedded workbook with this
index, e.g. an embedded Excel object
+ int workbookIndex = getNextPartNumber(chartWorkbookRelation,
chartIndex);
+ PackageRelationship xlsx =
createRelationshipInChart(chartWorkbookRelation, chartFactory, workbookIndex);
setExternalId(xlsx.getId());
return getTargetPart(xlsx);
}
diff --git
a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
index 4e41ab2e43..dcc9a1c310 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
@@ -26,9 +26,17 @@ import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.List;
+import org.apache.poi.ooxml.POIXMLDocument;
import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.openxml4j.opc.PackagePart;
+import org.apache.poi.openxml4j.opc.PackagePartName;
+import org.apache.poi.openxml4j.opc.PackagingURIHelper;
+import org.apache.poi.openxml4j.opc.TargetMode;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xddf.usermodel.chart.AxisCrossBetween;
import org.apache.poi.xddf.usermodel.chart.AxisCrosses;
@@ -37,6 +45,7 @@ import org.apache.poi.xddf.usermodel.chart.AxisPosition;
import org.apache.poi.xddf.usermodel.chart.AxisTickMark;
import org.apache.poi.xddf.usermodel.chart.BarDirection;
import org.apache.poi.xddf.usermodel.chart.BarGrouping;
+import org.apache.poi.xddf.usermodel.chart.ChartTypes;
import org.apache.poi.xddf.usermodel.chart.Grouping;
import org.apache.poi.xddf.usermodel.chart.LayoutMode;
import org.apache.poi.xddf.usermodel.chart.LayoutTarget;
@@ -56,6 +65,7 @@ import org.apache.poi.xddf.usermodel.chart.XDDFRadarChartData;
import org.apache.poi.xddf.usermodel.chart.XDDFScatterChartData;
import org.apache.poi.xddf.usermodel.chart.XDDFValueAxis;
import org.apache.poi.xslf.XSLFTestDataSamples;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.jupiter.api.Test;
/**
@@ -147,6 +157,37 @@ class TestXSLFChart {
pptx.close();
}
+ @Test
+ void testGitHub1002() throws IOException, InvalidFormatException {
+ try (XMLSlideShow pptx = new XMLSlideShow()) {
+ XSLFSlide slide = pptx.createSlide();
+ // an embedded Excel object, which already uses the part name of
the first chart workbook
+ PackagePartName embeddedName =
PackagingURIHelper.createPartName(XSLFRelation.WORKBOOK.getFileName(1));
+ PackagePart embeddedPart =
pptx.getPackage().createPart(embeddedName,
XSLFRelation.WORKBOOK.getContentType());
+ try (OutputStream out = embeddedPart.getOutputStream();
XSSFWorkbook embedded = new XSSFWorkbook()) {
+ embedded.createSheet("Embedded");
+ embedded.write(out);
+ }
+ slide.getPackagePart().addRelationship(embeddedName,
TargetMode.INTERNAL, POIXMLDocument.PACK_OBJECT_REL_TYPE);
+
+ XSLFChart chart = pptx.createChart(slide);
+ XDDFChartData pie = chart.createData(ChartTypes.PIE, null, null);
+ pie.addSeries(
+ XDDFDataSourcesFactory.fromArray(new String[]{"First",
"Second"}, chart.formatRange(new CellRangeAddress(1, 2, 0, 0)), 0),
+ XDDFDataSourcesFactory.fromArray(new Integer[]{1, 3},
chart.formatRange(new CellRangeAddress(1, 2, 1, 1)), 1));
+ chart.plot(pie);
+
+ try (XMLSlideShow pptx2 =
XSLFTestDataSamples.writeOutAndReadBack(pptx)) {
+ XSLFChart chart2 = pptx2.getCharts().get(0);
+ assertEquals(3.0,
chart2.getWorkbook().getSheetAt(0).getRow(2).getCell(1).getNumericCellValue());
+ try (InputStream in =
pptx2.getPackage().getPart(embeddedName).getInputStream();
+ XSSFWorkbook embedded2 = new XSSFWorkbook(in)) {
+ assertEquals("Embedded", embedded2.getSheetName(0));
+ }
+ }
+ }
+ }
+
private void fillChartData(XSLFChart chart, XDDFChartData data) {
final int numOfPoints = 3;
final String[] categories = {"First", "Second", "Third"};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]