Author: centic
Date: Tue Nov 2 13:17:53 2021
New Revision: 1894676
URL: http://svn.apache.org/viewvc?rev=1894676&view=rev
Log:
Do not fail on different count of categories and points and fix cloning charts
We see many cases where documents have charts with a difference here, so
downgrade the exception to a warning for now
Also handle cloning charts in workbooks where the parts have unexpected names
by making sure that the chosen part-name is not yet taken.
Added:
poi/trunk/test-data/spreadsheet/clone_sheet.xlsx
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java?rev=1894676&r1=1894675&r2=1894676&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
Tue Nov 2 13:17:53 2021
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Internal;
@@ -45,6 +47,8 @@ import org.openxmlformats.schemas.drawin
*/
@Beta
public abstract class XDDFChartData {
+ private static final Logger LOGGER =
LogManager.getLogger(XDDFChartData.class);
+
protected XDDFChart parent;
protected List<Series> series;
private XDDFCategoryAxis categoryAxis;
@@ -166,7 +170,7 @@ public abstract class XDDFChartData {
if (categoryData != null && values != null) {
int numOfPoints = category.getPointCount();
if (numOfPoints != values.getPointCount()) {
- throw new IllegalStateException("Category and values must
have the same point count, but had " +
+ LOGGER.warn("Category and values must have the same point
count, but had " +
numOfPoints + " categories and " +
values.getPointCount() + " values.");
}
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java?rev=1894676&r1=1894675&r2=1894676&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
Tue Nov 2 13:17:53 2021
@@ -33,6 +33,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.poi.ooxml.POIXMLDocumentPart;
import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackagePartName;
import org.apache.poi.openxml4j.opc.PackageRelationship;
@@ -243,9 +244,21 @@ public final class XSSFDrawing extends P
protected RelationPart createChartRelationPart() {
XSSFWorkbook wb = getSheet().getWorkbook();
XSSFFactory factory = wb == null ? XSSFFactory.getInstance() :
wb.getXssfFactory();
- int chartNumber =
getPackagePart().getPackage().getPartsByContentType(XSSFRelation.CHART.getContentType())
+ OPCPackage pkg = getPackagePart().getPackage();
+ int chartNumber =
pkg.getPartsByContentType(XSSFRelation.CHART.getContentType())
.size() + 1;
+ // some broken files have incorrectly named package parts,
+ // so we need to avoid duplicates here by checking and
increasing
+ // the part-number
+ try {
+ while
(pkg.getPart(PackagingURIHelper.createPartName(XSSFRelation.CHART.getFileName(chartNumber)))
!= null) {
+ chartNumber++;
+ }
+ } catch (InvalidFormatException e) {
+ throw new IllegalStateException("Failed for " +
chartNumber, e);
+ }
+
return createRelationship(XSSFRelation.CHART, factory, chartNumber,
false);
}
Added: poi/trunk/test-data/spreadsheet/clone_sheet.xlsx
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/clone_sheet.xlsx?rev=1894676&view=auto
==============================================================================
Binary files poi/trunk/test-data/spreadsheet/clone_sheet.xlsx (added) and
poi/trunk/test-data/spreadsheet/clone_sheet.xlsx Tue Nov 2 13:17:53 2021 differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
