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

Fix for splitting list inside table cell

Browse source
This commit is contained in:
Georgy Litvinov 2020-04-14 09:52:00 +02:00
parent 2f193d8cb5
commit 189558113b
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public class ODFPageSplitter {
//Loop through the content nodes and split nodes with soft page break //Loop through the content nodes and split nodes with soft page break
while (i < nodes.getLength()){ while (i < nodes.getLength()){
Node child = nodes.item(i); Node child = nodes.item(i);
//System.out.println("splitSoftPageBreak ");
//Necessary check if node is an Element //Necessary check if node is an Element
if (containsSPB(child)){ if (containsSPB(child)){
@ -271,7 +271,7 @@ public class ODFPageSplitter {
// Loop through the TABLE:TABLE child nodes // Loop through the TABLE:TABLE child nodes
while (tableChildNodes.getLength() > i) { while (tableChildNodes.getLength() > i) {
Node tableChildNode = tableChildNodes.item(i); Node tableChildNode = tableChildNodes.item(i);
if (tableChildNode.getNodeType() == Node.ELEMENT_NODE) { if (tableChildNode.getNodeType() == Node.ELEMENT_NODE) {
//Node name //Node name
String tableChildNodeName = tableChildNode.getNodeName(); String tableChildNodeName = tableChildNode.getNodeName();
@ -495,7 +495,13 @@ public class ODFPageSplitter {
cellFirstPart.appendChild(paraFirstPart); cellFirstPart.appendChild(paraFirstPart);
dataMoved=true; dataMoved=true;
} }
} } else if (nodeName.equals(TEXT_LIST)) {
Node listFirstPart = cellChildNode.cloneNode(false);
if (handleList(listFirstPart, cellChildNode)){
cellFirstPart.appendChild(listFirstPart);
dataMoved=true;
}
}
break; break;
} else { } else {
cellFirstPart.appendChild(cellChildNode); cellFirstPart.appendChild(cellChildNode);

2
src/main/oxt/description.xml
View file

@ -3,7 +3,7 @@
<identifier value="pro.litvinovg.writer2paginatedhtml"/> <identifier value="pro.litvinovg.writer2paginatedhtml"/>
<version value="0.5.5"/> <version value="0.5.6"/>
<dependencies> <dependencies>
<OpenOffice.org-minimal-version d:name="OpenOffice.org 3.0" value="3.0"/> <OpenOffice.org-minimal-version d:name="OpenOffice.org 3.0" value="3.0"/>