svn commit: r1913674 - in /poi/trunk/poi-ooxml/src: main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java

[fanningpj]

Author: fanningpj
Date: Wed Nov  8 12:34:41 2023
New Revision: 1913674

URL: http://svn.apache.org/viewvc?rev=1913674&view=rev
Log:
[bug-67510] issue with empty num format on chart axes

Modified:
    
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
    
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java

Modified: 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java?rev=1913674&r1=1913673&r2=1913674&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
 Wed Nov  8 12:34:41 2023
@@ -146,10 +146,10 @@ public abstract class XDDFChartAxis impl
     }
 
     /**
-     * @return axis number format
+     * @return axis number format (can be null if no number format is set)
      */
     public String getNumberFormat() {
-        return getCTNumFmt().getFormatCode();
+        return hasNumberFormat() ? getCTNumFmt().getFormatCode() : null;
     }
 
     /**

Modified: 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java?rev=1913674&r1=1913673&r2=1913674&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
 Wed Nov  8 12:34:41 2023
@@ -17,11 +17,6 @@
 
 package org.apache.poi.xssf.usermodel.charts;
 
-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.assertTrue;
-
 import java.io.IOException;
 import java.util.List;
 
@@ -38,6 +33,8 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public final class TestXSSFChartAxis {
 
     private static final double EPSILON = 1E-7;
@@ -52,6 +49,8 @@ public final class TestXSSFChartAxis {
         XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 
30);
         XSSFChart chart = drawing.createChart(anchor);
         axis = chart.createValueAxis(AxisPosition.BOTTOM);
+        // no format set yet
+        assertNull(axis.getNumberFormat());
     }
 
     @AfterEach



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org