• R/O
  • SSH
  • HTTPS

copper: Commit


Commit MetaInfo

Revision1613 (tree)
Time2021-08-18 12:55:13
Authormiyabe

Log Message

(empty log message)

Change Summary

Incremental Difference

--- copper/trunk/homare/src/main/java/jp/cssj/homare/style/box/impl/TableRowBox.java (revision 1612)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/style/box/impl/TableRowBox.java (revision 1613)
@@ -571,13 +571,11 @@
571571 public final void cutRowspanCells() {
572572 // 連結されたセルを強制切断する
573573 final boolean vertical = StyleUtils.isVertical(this.tableParams.flow);
574- boolean cut = false;
575574 for (int i = 0; i < this.cells.size(); ++i) {
576575 Cell cell = (Cell) this.cells.get(i);
577576 if (cell.isSource()) {
578577 continue;
579578 }
580- cut = true;
581579 TableCellBox prevCell = cell.getCellBox();
582580 // 切断面は行の上辺、即ちセルの高さから現在行の高さを引いたもの
583581 Cell sCell = cell.getSource();
@@ -621,9 +619,6 @@
621619 // System.err.println("TR cutRowSpanCells: " + i + "/"
622620 // + prevCell.getHeight());
623621 }
624- if (!cut) {
625- return;
626- }
627622 for (int i = 0; i < this.cells.size(); ++i) {
628623 Cell cell = (Cell) this.cells.get(i);
629624 double rowSize = this.pageSize;
--- copper/trunk/homare/src/main/java/jp/cssj/homare/style/builder/impl/OnePassTableBuilder.java (revision 1612)
+++ copper/trunk/homare/src/main/java/jp/cssj/homare/style/builder/impl/OnePassTableBuilder.java (revision 1613)
@@ -1172,8 +1172,8 @@
11721172 int span = cell.colspan;
11731173 if (cell.isExtended()) {
11741174 i += span - 1;
1175- Cell source = (Cell) this.cellToSource.get(cell.getCellBox());
1176- rowBox.addTableExtendedCell(source);
1175+ Cell rcell = (Cell) this.cellToSource.get(cell.getCellBox());
1176+ this.cellToSource.put(cell.getCellBox(), rowBox.addTableExtendedCell(rcell));
11771177 continue;
11781178 }
11791179 final TableCellBox cellBox = cell.getCellBox();
Show on old repository browser