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

Split tables in tables

Browse source
This commit is contained in:
Georgy Litvinov 2020-07-24 17:02:43 +02:00
parent 96cb7d9a72
commit b1788f2472
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -214,9 +214,6 @@ public class ODFPageSplitter {
if (!child.hasChildNodes()){ if (!child.hasChildNodes()){
list.removeChild(child); list.removeChild(child);
} }
} }
//Add text:continue-numbering="true" //Add text:continue-numbering="true"
if (dataMoved){ if (dataMoved){
@ -230,7 +227,11 @@ public class ODFPageSplitter {
} }
} else {
System.out.println("Error. SPB in List child node " + nodeName);
System.exit(1);
} }
} }
} }
if (dataMoved) { if (dataMoved) {
@ -264,6 +265,9 @@ public class ODFPageSplitter {
if (handleParagraph(listItemChild)){ if (handleParagraph(listItemChild)){
listItemFirstPart.appendChild(listItemChild.getPreviousSibling()); listItemFirstPart.appendChild(listItemChild.getPreviousSibling());
dataMoved=true; dataMoved=true;
} else {
System.out.println("Error. SPB in List item child node " + nodeName);
System.exit(1);
} }
} }
break; break;
@ -536,7 +540,16 @@ public class ODFPageSplitter {
cellFirstPart.appendChild(cellChildNode.getPreviousSibling()); cellFirstPart.appendChild(cellChildNode.getPreviousSibling());
dataMoved=true; dataMoved=true;
} }
} } else if (nodeName.equals(TABLE_TABLE)) {
if (handleTableTable(cellChildNode)){
cellFirstPart.appendChild(cellChildNode.getPreviousSibling());
dataMoved=true;
}
} else {
System.out.println("Error. SPB in Cell child node " + nodeName);
System.exit(1);
}
break; break;
} else { } else {
cellFirstPart.appendChild(cellChildNode); cellFirstPart.appendChild(cellChildNode);
@ -594,6 +607,9 @@ public class ODFPageSplitter {
if (handleList(child)){ if (handleList(child)){
dataMoved=true; dataMoved=true;
} }
} else {
System.out.println("Error. SPB in Section child node " + nodeName);
System.exit(1);
} }
//split node with spb and exit //split node with spb and exit
break; break;