From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 15 Jul 2021 08:22:45 +0000 (+0200)
Subject: Improve remove empty paragraph.
X-Git-Tag: argeo-suite-2.3.1~23
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=e3e0118b40d4036ef9739d12c7811922d375d46e

Improve remove empty paragraph.
---

diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
index b654c73..6db73d0 100644
--- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
+++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java
@@ -115,15 +115,21 @@ public class DbkUtils {
 		try {
 			if (isDbk(node, DbkType.para)) {
 				NodeIterator nit = node.getNodes();
-				if (!nit.hasNext())
-					return false;// log this unexpected situation?
+				if (!nit.hasNext()) {
+					node.remove();
+					return true;
+				}
 				Node first = nit.nextNode();
 				if (nit.hasNext())
 					return false;
-				String str = JcrxApi.getXmlValue(first);
-				if (str != null && str.trim().equals("")) {
-					node.remove();
-					return true;
+				if (first.getName().equals(Jcr.JCR_XMLTEXT)) {
+					String str = JcrxApi.getXmlValue(first);
+					if (str != null && str.trim().equals("")) {
+						node.remove();
+						return true;
+					}
+				} else {
+					return false;
 				}
 			}
 			return false;