This commit is contained in:
Georgy Litvinov 2020-07-02 15:40:01 +02:00
parent 3b8e0826e9
commit 4f151a7e5e
2 changed files with 5 additions and 3 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd"> <!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 End Sub
@ -1014,6 +1014,7 @@ Private Sub convertEnclosuresToFormat(identifier As String, styleNames, styleVal
Dim rightEnclosure As String Dim rightEnclosure As String
Dim SDesc As Object Dim SDesc As Object
Dim found As Object Dim found As Object
leftEnclosure = compileLeftEnclosure(identifier) leftEnclosure = compileLeftEnclosure(identifier)
rightEnclosure = compileRightEnclosure(identifier) rightEnclosure = compileRightEnclosure(identifier)
SDesc = Thiscomponent.createSearchDescriptor() SDesc = Thiscomponent.createSearchDescriptor()
@ -1370,6 +1371,7 @@ Private Sub convertFormatToUserFields(identifier As String, styleNames, styleVal
Dim leftField As String Dim leftField As String
Dim rightField As String Dim rightField As String
Dim i As Integer Dim i As Integer
Dim found As Object
leftField = &quot;left&quot; &amp; identifier leftField = &quot;left&quot; &amp; identifier
rightField = &quot;right&quot; &amp; identifier rightField = &quot;right&quot; &amp; identifier
Dim SrchAttributes(Ubound(styleNames)) as new com.sun.star.beans.PropertyValue 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) found = Thiscomponent.findFirst(SDesc)
i = 0 i = 0
Do While not isNull(found) 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.End,rightField &amp; i,&quot;&quot;)
insertUserField(found.start,leftField &amp; i,&quot;&quot;) insertUserField(found.start,leftField &amp; i,&quot;&quot;)
i = i + 1 i = i + 1

View file

@ -1,4 +1,4 @@
def releaseVersion = "0.7.16" def releaseVersion = "0.7.17"
task oxt(type: Zip) { task oxt(type: Zip) {
dependsOn = [ 'setVersion','setVersionInBasicCode' ] dependsOn = [ 'setVersion','setVersionInBasicCode' ]
from './' from './'