From 1db7f3bd3b663c89ed3ecc6953dedea637d5eb5a Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Mon, 22 Dec 2014 14:16:23 +0000 Subject: [PATCH] Bug 57362: Properly initialize chart axis when loading a workbook which already contains a chart. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1647317 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/xssf/usermodel/XSSFChart.java | 17 +++++++------- .../usermodel/charts/TestXSSFChartAxis.java | 22 ++++++++++++++++++ test-data/spreadsheet/57362.xlsx | Bin 0 -> 13283 bytes 3 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 test-data/spreadsheet/57362.xlsx diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java index 41038114f6..0f2179a9dc 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java @@ -79,14 +79,13 @@ public final class XSSFChart extends POIXMLDocumentPart implements Chart, ChartA */ private CTChart chart; - List axis; + List axis = new ArrayList(); /** * Create a new SpreadsheetML chart */ protected XSSFChart() { super(); - axis = new ArrayList(); createChart(); } @@ -227,13 +226,13 @@ public final class XSSFChart extends POIXMLDocumentPart implements Chart, ChartA return categoryAxis; } - public List getAxis() { - if (axis.isEmpty() && hasAxis()) { - parseAxis(); - } - return axis; - } - + public List getAxis() { + if (axis.isEmpty() && hasAxis()) { + parseAxis(); + } + return axis; + } + public XSSFManualLayout getManualLayout() { return new XSSFManualLayout(this); } diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java index 0188c71555..f1351f1862 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java @@ -17,9 +17,14 @@ package org.apache.poi.xssf.usermodel.charts; +import java.util.List; + import junit.framework.TestCase; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.charts.*; +import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.usermodel.*; public final class TestXSSFChartAxis extends TestCase { @@ -111,4 +116,21 @@ public final class TestXSSFChartAxis extends TestCase { axis.setMinorTickMark(AxisTickMark.CROSS); assertEquals(AxisTickMark.CROSS, axis.getMinorTickMark()); } + + public void testGetChartAxisBug57362() { + //Load existing excel with some chart on it having primary and secondary axis. + final Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("57362.xlsx"); + final Sheet sh = workbook.getSheetAt(0); + final XSSFSheet xsh = (XSSFSheet) sh; + final XSSFDrawing drawing = xsh.createDrawingPatriarch(); + final XSSFChart chart = drawing.getCharts().get(0); + + final List axisList = chart.getAxis(); + + assertEquals(4, axisList.size()); + assertNotNull(axisList.get(0)); + assertNotNull(axisList.get(1)); + assertNotNull(axisList.get(2)); + assertNotNull(axisList.get(3)); + } } diff --git a/test-data/spreadsheet/57362.xlsx b/test-data/spreadsheet/57362.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..ec2be38234f922651c9b441048481a7077c9dc88 GIT binary patch literal 13283 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 literal 0 HcmV?d00001 -- 2.39.5