Skip to content

Commit d8fa549

Browse files
authored
Merge pull request #382 from liaochong/Hotfix/4.3.0.RC1
Hotfix/4.3.0.rc1
2 parents 608ce14 + eec1703 commit d8fa549

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>com.github.liaochong</groupId>
1313
<artifactId>myexcel</artifactId>
14-
<version>4.3.0.RC</version>
14+
<version>4.3.0.RC1</version>
1515
<packaging>jar</packaging>
1616

1717
<name>myexcel</name>
@@ -22,8 +22,8 @@
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2323
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2424
<java.version>1.8</java.version>
25-
<poi.version>5.2.2</poi.version>
26-
<jsoup.version>1.15.2</jsoup.version>
25+
<poi.version>5.2.3</poi.version>
26+
<jsoup.version>1.15.3</jsoup.version>
2727
<lombok.version>1.18.22</lombok.version>
2828
<beetl.version>3.9.0.RELEASE</beetl.version>
2929
<velocity.version>2.3</velocity.version>

src/main/java/com/github/liaochong/myexcel/core/AbstractExcelFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public abstract class AbstractExcelFactory implements ExcelFactory {
150150
/**
151151
* 暂存单元格,由后续行认领
152152
*/
153-
private final List<Td> stagingTds = new LinkedList<>();
153+
protected List<Td> stagingTds = new LinkedList<>();
154154

155155
private CreationHelper createHelper;
156156

src/main/java/com/github/liaochong/myexcel/core/HtmlToExcelFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.io.File;
3131
import java.io.IOException;
3232
import java.nio.file.NoSuchFileException;
33+
import java.util.LinkedList;
3334
import java.util.List;
3435
import java.util.Map;
3536
import java.util.Objects;
@@ -252,6 +253,7 @@ private void setTdOfTable(Table table, Sheet sheet) {
252253
this.createRow(tr, sheet);
253254
tr.tdList = null;
254255
}
256+
stagingTds = new LinkedList<>();
255257
table.trList = null;
256258
this.setColWidth(colMaxWidthMap, sheet, maxColIndex);
257259
}

0 commit comments

Comments
 (0)