From 189558113b4f4ef6c8f2ed42a27b7d12635bb579 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Tue, 14 Apr 2020 09:52:00 +0200
Subject: [PATCH] Fix for splitting list inside table cell
---
src/main/java/w2phtml/xhtml/ODFPageSplitter.java | 12 +++++++++---
src/main/oxt/description.xml | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/w2phtml/xhtml/ODFPageSplitter.java b/src/main/java/w2phtml/xhtml/ODFPageSplitter.java
index 22b9d7f..81b9d3e 100644
--- a/src/main/java/w2phtml/xhtml/ODFPageSplitter.java
+++ b/src/main/java/w2phtml/xhtml/ODFPageSplitter.java
@@ -27,7 +27,7 @@ public class ODFPageSplitter {
//Loop through the content nodes and split nodes with soft page break
while (i < nodes.getLength()){
Node child = nodes.item(i);
- //System.out.println("splitSoftPageBreak ");
+
//Necessary check if node is an Element
if (containsSPB(child)){
@@ -271,7 +271,7 @@ public class ODFPageSplitter {
// Loop through the TABLE:TABLE child nodes
while (tableChildNodes.getLength() > i) {
Node tableChildNode = tableChildNodes.item(i);
-
+
if (tableChildNode.getNodeType() == Node.ELEMENT_NODE) {
//Node name
String tableChildNodeName = tableChildNode.getNodeName();
@@ -495,7 +495,13 @@ public class ODFPageSplitter {
cellFirstPart.appendChild(paraFirstPart);
dataMoved=true;
}
- }
+ } else if (nodeName.equals(TEXT_LIST)) {
+ Node listFirstPart = cellChildNode.cloneNode(false);
+ if (handleList(listFirstPart, cellChildNode)){
+ cellFirstPart.appendChild(listFirstPart);
+ dataMoved=true;
+ }
+ }
break;
} else {
cellFirstPart.appendChild(cellChildNode);
diff --git a/src/main/oxt/description.xml b/src/main/oxt/description.xml
index bff61da..411f7eb 100644
--- a/src/main/oxt/description.xml
+++ b/src/main/oxt/description.xml
@@ -3,7 +3,7 @@
<identifier value="pro.litvinovg.writer2paginatedhtml"/>
- <version value="0.5.5"/>
+ <version value="0.5.6"/>
<dependencies>
<OpenOffice.org-minimal-version d:name="OpenOffice.org 3.0" value="3.0"/>