litvinovg/cleanandvalidate
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases 50 Packages Wiki Activity Actions

Bugfix

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

4
cleanandvalidate.update.xml
View file

@ -2,9 +2,9 @@
<description xmlns="http://openoffice.org/extensions/update/2006" <description xmlns="http://openoffice.org/extensions/update/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"> xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="pro.litvinovg.Redaction"/> <identifier value="pro.litvinovg.Redaction"/>
<version value="0.6.3" /> <version value="0.6.4" />
<update-download> <update-download>
<src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/b5e9f19d02f7182b4816b5fc04b8dc4c/cleanAndValidate.oxt" /> <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/uploads/ff48dad6ec7c43f2ec5e06a6e14c5d1e/cleanAndValidate.oxt" />
</update-download> </update-download>
<release-notes> <release-notes>
<src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/-/raw/master/releasenotes.txt" lang="en" /> <src xlink:href="https://dev.litvinovg.pro/litvinovg/cleanandvalidate/-/raw/master/releasenotes.txt" lang="en" />

2
description.xml
View file

@ -3,7 +3,7 @@
xmlns:dep="http://openoffice.org/extensions/description/2006" xmlns:dep="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink"> xmlns:xlink="http://www.w3.org/1999/xlink">
<identifier value="pro.litvinovg.Redaction" /> <identifier value="pro.litvinovg.Redaction" />
<version value="0.6.3" /> <version value="0.6.4" />
<platform value="all" /> <platform value="all" />
<display-name> <display-name>
<name lang="en">Cleaning and validation documents for publishing in html and epub with pagination</name> <name lang="en">Cleaning and validation documents for publishing in html and epub with pagination</name>

1
releasenotes.txt
View file

@ -1,3 +1,4 @@
0.6.4 Bugfix for latest format cleaning with fields
0.6.3 Update configuration added 0.6.3 Update configuration added
0.6.2 Remove all macros from document 0.6.2 Remove all macros from document
0.6.1 Cleaning with user fields 0.6.1 Cleaning with user fields