|
@@ -59,7 +59,7 @@ public final class Util {
|
|
|
for (int j = 0; j < n; j++) {
|
|
|
if (lastKey.equals(key)) {
|
|
|
// 清除被合并单元格内容
|
|
|
- getParagraphForCell(table.getRow(i).getCell(j)).getRuns().get(0).setText("");;
|
|
|
+ getParagraphForCell(table.getRow(i).getCell(j)).getRuns().get(0).setText("");
|
|
|
TableTools.mergeCellsVertically(table, j, currentStart, i);
|
|
|
} else {
|
|
|
currentStart = i;
|
|
@@ -137,8 +137,9 @@ public final class Util {
|
|
|
CTTcPr tcPr = current.getCTTc().getTcPr();
|
|
|
if (null != tcPr) {
|
|
|
CTDecimalNumber gridSpan = tcPr.getGridSpan();
|
|
|
- if (null != gridSpan)
|
|
|
+ if (null != gridSpan) {
|
|
|
intValue = gridSpan.getVal().intValue();
|
|
|
+ }
|
|
|
}
|
|
|
orginalCol += intValue;
|
|
|
if (current.getCTTc() == cell.getCTTc()) {
|