litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Refactored handle cell.

Browse source
This commit is contained in:
Georgy Litvinov 2020-07-24 20:34:11 +02:00
parent 6d14ebecaa
commit 3a453fb046
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/w2phtml/xhtml/ODFPageSplitter.java
View file

@ -491,18 +491,17 @@ public class ODFPageSplitter {
String nodeName = tableRowChildNode.getNodeName(); String nodeName = tableRowChildNode.getNodeName();
if (containsSPB(tableRowChildNode)){ if (containsSPB(tableRowChildNode)){
Node tableRowGroupChildFirstPart = tableRowChildNode.cloneNode(false);
if (nodeName.equals(TABLE_TABLE_CELL)){ if (nodeName.equals(TABLE_TABLE_CELL)){
if (handleCell(tableRowGroupChildFirstPart, tableRowChildNode)){ if (handleCell(tableRowChildNode)){
dataMoved = true; dataMoved = true;
tableRowFirstPart.appendChild(tableRowGroupChildFirstPart); tableRowFirstPart.appendChild(tableRowChildNode.getPreviousSibling());
} }
} else if (nodeName.equals(TABLE_COVERED_TABLE_CELL)){ } else if (nodeName.equals(TABLE_COVERED_TABLE_CELL)){
//Implement handleCoveredCell in future //Implement handleCoveredCell in future
if (handleCell(tableRowGroupChildFirstPart, tableRowChildNode)){ if (handleCell(tableRowChildNode)){
dataMoved = true; dataMoved = true;
tableRowFirstPart.appendChild(tableRowGroupChildFirstPart); tableRowFirstPart.appendChild(tableRowChildNode.getPreviousSibling());
} }
} }
} else { } else {
@ -533,7 +532,9 @@ public class ODFPageSplitter {
} }
return dataMoved; return dataMoved;
} }
private static boolean handleCell(Node cellFirstPart, Node cellNode) { private static boolean handleCell( Node cellNode) {
Node cellFirstPart = cellNode.cloneNode(false);
Node parent = cellNode.getParentNode();
boolean dataMoved = false; boolean dataMoved = false;
// Node counter // Node counter
int i = 0; int i = 0;
@ -578,6 +579,10 @@ public class ODFPageSplitter {
} }
} }
if (dataMoved) {
parent.insertBefore(cellFirstPart, cellNode);
}
return dataMoved; return dataMoved;
} }
private static boolean handleSection(Node section) { private static boolean handleSection(Node section) {