Fixed issue dhatim#392

meiMingle · Apr 9, 2024 · 899f64b · 899f64b
1 parent b6503d1
commit 899f64b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/fastexcel-reader/src/main/java/org/dhatim/fastexcel/reader/OPCPackage.java b/fastexcel-reader/src/main/java/org/dhatim/fastexcel/reader/OPCPackage.java
@@ -141,9 +141,8 @@ private List<String> extractFormat(String styleXml) throws XMLStreamException, I
         fmtIdToFmtString = new HashMap<>();
         try (SimpleXmlReader reader = new SimpleXmlReader(factory, getRequiredEntryContent(styleXml))) {
             AtomicBoolean insideCellXfs = new AtomicBoolean(false);
-            while (reader.goTo(() -> reader.isStartElement("numFmt") ||
-                reader.isStartElement("cellXfs") || reader.isEndElement("cellXfs") ||
-                insideCellXfs.get())) {
+            while (reader.goTo(() -> reader.isStartElement("numFmt") || reader.isStartElement("xf") ||
+                    reader.isStartElement("cellXfs") || reader.isEndElement("cellXfs"))) {
                 if (reader.isStartElement("cellXfs")) {
                     insideCellXfs.set(true);
                 } else if (reader.isEndElement("cellXfs")) {
@@ -153,7 +152,7 @@ private List<String> extractFormat(String styleXml) throws XMLStreamException, I
                     String formatCode = reader.getAttributeRequired("formatCode");
                     fmtIdToFmtString.put(reader.getAttributeRequired("numFmtId"), formatCode);
                 } else if (insideCellXfs.get() && reader.isStartElement("xf")) {
-                    String numFmtId = reader.getAttribute ("numFmtId");
+                    String numFmtId = reader.getAttribute("numFmtId");
                     fmtIdList.add(numFmtId);
                     if (IMPLICIT_NUM_FMTS.containsKey(numFmtId)) {
                         fmtIdToFmtString.put(numFmtId, IMPLICIT_NUM_FMTS.get(numFmtId));
@@ -166,7 +165,7 @@ private List<String> extractFormat(String styleXml) throws XMLStreamException, I
 
     private InputStream getRequiredEntryContent(String name) throws IOException {
         return Optional.ofNullable(getEntryContent(name))
-            .orElseThrow(() -> new ExcelReaderException(name + " not found"));
+                .orElseThrow(() -> new ExcelReaderException(name + " not found"));
     }
 
     static OPCPackage open(File inputFile) throws IOException {

diff --git a/fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/ExcelFileWithCRLFTest.java b/fastexcel-reader/src/test/java/org/dhatim/fastexcel/reader/ExcelFileWithCRLFTest.java
@@ -0,0 +1,33 @@
+package org.dhatim.fastexcel.reader;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.stream.Stream;
+
+import static org.dhatim.fastexcel.reader.Resources.open;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class ExcelFileWithCRLFTest {
+
+    @Test
+    public void testFileWithCRLF() throws IOException {
+        try (InputStream inputStream = open("/xlsx/withStyleCRLF.xlsx");
+             ReadableWorkbook excel = new ReadableWorkbook(inputStream, new ReadingOptions(true, true))) {
+            Sheet firstSheet = excel.getFirstSheet();
+            try (Stream<Row> rows = firstSheet.openStream()) {
+                rows.forEach(r -> {
+                    if (r.getRowNum() > 1) {
+                        r.forEach(c -> {
+                            if (c != null) {
+                                assertNotNull(c.getDataFormatString());
+                            }
+                        });
+                    }
+                });
+            }
+        }
+    }
+
+}
diff --git a/fastexcel-reader/src/test/resources/xlsx/withStyleCRLF.xlsx b/fastexcel-reader/src/test/resources/xlsx/withStyleCRLF.xlsx