This commit is contained in:
Georgy Litvinov 2020-04-17 20:35:40 +02:00
parent ec144e010a
commit afef3250b1
4 changed files with 10 additions and 6 deletions

View file

@ -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 mark39
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark40
End Sub
@ -646,6 +646,8 @@ Private Sub cleanFormatting
removeDirectFormatting()
saveAndreload()
convertUserFieldsToFormatting
End Sub
@ -1328,9 +1330,10 @@ Private Sub convertFormatToUserFields(identifier As String, styleNames, styleVal
If Len(found.String) &lt;&gt; 0 Then
insertUserField(found.End,rightField &amp; i,&quot;&quot;)
insertUserField(found.start,leftField &amp; i,&quot;&quot;)
i = i + 1
EndIf
found = Thiscomponent.findNext(found.End, SDesc)
i = i + 1
Loop
End Sub
@ -1353,6 +1356,7 @@ Private Sub convertUserFieldsToFormat(identifier As String, styleNames , styleVa
leftFieldName = &quot;com.sun.star.text.FieldMaster.User&quot; &amp; &quot;.&quot; &amp; &quot;left&quot; &amp; identifier &amp; i
rightFieldName = &quot;com.sun.star.text.FieldMaster.User&quot; &amp; &quot;.&quot; &amp; &quot;right&quot; &amp; identifier &amp; i
If oMasters.hasByName(leftFieldName) AND oMasters.hasByName(rightFieldName) Then
i=i+1
leftFieldMaster = oMasters.getByName(leftFieldName)
leftField = leftFieldMaster.DependentTextFields(0)
leftAnchor = leftField.getAnchor()
@ -1367,7 +1371,6 @@ Private Sub convertUserFieldsToFormat(identifier As String, styleNames , styleVa
leftFieldMaster.dispose()
rightField.dispose()
rightFieldMaster.dispose()
i=i+1
Else
Exit sub
EndIf