From 4f151a7e5e9340182195812c3f6c7fbc0bc649b2 Mon Sep 17 00:00:00 2001
From: Georgy Litvinov <git@litvinovg.pro>
Date: Thu, 2 Jul 2020 15:40:01 +0200
Subject: [PATCH] Fix

---
 Redaction/Clean.xba | 6 ++++--
 build.gradle        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Redaction/Clean.xba b/Redaction/Clean.xba
index 875fdd6..ad7f69c 100644
--- a/Redaction/Clean.xba
+++ b/Redaction/Clean.xba
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark57
+<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark58
 
 End Sub
 
@@ -1014,6 +1014,7 @@ Private Sub convertEnclosuresToFormat(identifier As String, styleNames, styleVal
 	Dim rightEnclosure As String
 	Dim SDesc As Object
 	Dim found As Object
+
 	leftEnclosure = compileLeftEnclosure(identifier)
 	rightEnclosure = compileRightEnclosure(identifier)
 	SDesc = Thiscomponent.createSearchDescriptor()
@@ -1370,6 +1371,7 @@ Private Sub convertFormatToUserFields(identifier As String, styleNames, styleVal
 	Dim leftField As String
 	Dim rightField As String
 	Dim i As Integer
+	Dim found As Object
 	leftField = &quot;left&quot; &amp; identifier
 	rightField = &quot;right&quot; &amp; identifier
 	Dim SrchAttributes(Ubound(styleNames)) as new com.sun.star.beans.PropertyValue
@@ -1388,7 +1390,7 @@ Private Sub convertFormatToUserFields(identifier As String, styleNames, styleVal
 	found = Thiscomponent.findFirst(SDesc)
 	i = 0
 	  Do While not isNull(found)
-		If Len(found.String) &lt;&gt; 0 Then
+		If Len(found.String) &lt;&gt; 0 AND NOT IsNull(found.Text) Then
 			insertUserField(found.End,rightField &amp; i,&quot;&quot;)
 			insertUserField(found.start,leftField &amp; i,&quot;&quot;)
 			i = i + 1
diff --git a/build.gradle b/build.gradle
index 4013b4c..7e979dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-def releaseVersion = "0.7.16"
+def releaseVersion = "0.7.17"
 task oxt(type: Zip) {
    dependsOn = [ 'setVersion','setVersionInBasicCode' ]
    from './'