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

Refactored table split method

Browse source
This commit is contained in:
Georgy Litvinov 2020-07-24 14:45:33 +02:00
parent b228bb9333
commit 50050c7de2
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,8 +43,7 @@ public class ODFPageSplitter {
style = ofr.getParStyle(Misc.getAttribute(child, TEXT_STYLE_NAME)); style = ofr.getParStyle(Misc.getAttribute(child, TEXT_STYLE_NAME));
} }
} else if (nodeName.equals(TABLE_TABLE)) { } else if (nodeName.equals(TABLE_TABLE)) {
if (handleTableTable(childFirstPart, child)){ if (handleTableTable(child)){
onode.insertBefore(childFirstPart, child);
style = ofr.getTableStyle(Misc.getAttribute(child, TABLE_STYLE_NAME)); style = ofr.getTableStyle(Misc.getAttribute(child, TABLE_STYLE_NAME));
} }
} else if (nodeName.equals(TEXT_LIST)) { } else if (nodeName.equals(TEXT_LIST)) {
@ -273,7 +272,7 @@ public class ODFPageSplitter {
return dataMoved; return dataMoved;
} }
//Needs finish //Needs finish
private static boolean handleTableTable(Node tableFirstPart, Node table) { private static boolean handleTableTable(Node table) {
/* /*
* // TODO: 0.Test if soft-page-break not at start of table // - in that * // TODO: 0.Test if soft-page-break not at start of table // - in that
@ -288,6 +287,8 @@ public class ODFPageSplitter {
* *
* *
*/ */
Node parent = table.getParentNode();
Node tableFirstPart = table.cloneNode(false);
NodeList tableChildNodes = table.getChildNodes(); NodeList tableChildNodes = table.getChildNodes();
// Node counter // Node counter
int i = 0; int i = 0;
@ -349,6 +350,9 @@ public class ODFPageSplitter {
} }
} }
} }
if (dataMoved) {
parent.insertBefore(tableFirstPart, table);
}
return dataMoved; return dataMoved;
} }
@ -571,8 +575,8 @@ public class ODFPageSplitter {
i++; i++;
continue; continue;
} else if (nodeName.equals(TABLE_TABLE)) { } else if (nodeName.equals(TABLE_TABLE)) {
if (handleTableTable(childFirstPart, child)){ if (handleTableTable(child)){
sectionFirstPart.appendChild(childFirstPart); sectionFirstPart.appendChild(child.getPreviousSibling());
dataMoved=true; dataMoved=true;
} }
} else if (nodeName.equals(TEXT_SECTION)) { } else if (nodeName.equals(TEXT_SECTION)) {