Merge pull request #287 from liaochong/Hotfix/3.9.10

Hotfix/3.9.10
liaochong · Nov 21, 2020 · f870109 · f870109
2 parents b4a7d53 + 47a46c2
commit f870109
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.github.liaochong</groupId>
     <artifactId>myexcel</artifactId>
-    <version>3.9.9</version>
+    <version>3.9.10</version>
     <packaging>jar</packaging>
 
     <name>myexcel</name>

diff --git a/src/main/java/com/github/liaochong/myexcel/core/AbstractExcelBuilder.java b/src/main/java/com/github/liaochong/myexcel/core/AbstractExcelBuilder.java
@@ -37,7 +37,7 @@ public abstract class AbstractExcelBuilder implements ExcelBuilder {
 
     protected HtmlToExcelFactory htmlToExcelFactory = new HtmlToExcelFactory();
 
-    AbstractExcelBuilder(Class<? extends TemplateHandler> templateHandlerClass) {
+    protected AbstractExcelBuilder(Class<? extends TemplateHandler> templateHandlerClass) {
         widthStrategy(WidthStrategy.COMPUTE_AUTO_WIDTH);
         this.templateHandler = ReflectUtil.newInstance(templateHandlerClass);
     }

diff --git a/src/main/java/com/github/liaochong/myexcel/core/AbstractExcelFactory.java b/src/main/java/com/github/liaochong/myexcel/core/AbstractExcelFactory.java
@@ -54,6 +54,7 @@
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.Units;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
@@ -353,8 +354,12 @@ private void setImage(Td td, Sheet sheet) {
             int pictureIdx = workbook.addPicture(bytes, format);
             Drawing drawing = sheet.createDrawingPatriarch();
             ClientAnchor anchor = createHelper.createClientAnchor();
+            anchor.setDx1(isHssf ? 2 : Units.EMU_PER_PIXEL);
+            anchor.setDy1(isHssf ? 2 : Units.EMU_PER_PIXEL);
             anchor.setCol1(td.getCol());
             anchor.setRow1(td.getRow());
+            anchor.setCol2(td.getColBound());
+            anchor.setRow2(td.getRowBound());
             Picture pict = drawing.createPicture(anchor, pictureIdx);
             pict.resize(1, 1);
         } catch (IOException e) {