Fixes for WL conversion

This commit is contained in:
Georgy Litvinov 2020-12-14 18:26:35 +01:00
parent 3452ffd219
commit c0af554240

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 mark70 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="Clean" script:language="StarBasic">Sub mark71
End Sub End Sub
@ -165,6 +165,8 @@ Private Sub quietCleaning
statusIndicator.Start(getTranslation(&quot;statusReplaceFontsInStyles&quot;),100) statusIndicator.Start(getTranslation(&quot;statusReplaceFontsInStyles&quot;),100)
replaceStyleFonts replaceStyleFonts
statusIndicator.Start(getTranslation(&quot;statusConvertSymbolsInTargetFonts&quot;),100) statusIndicator.Start(getTranslation(&quot;statusConvertSymbolsInTargetFonts&quot;),100)
saveAndreload()
statusIndicator = ThisComponent.getCurrentController.statusIndicator
unicodeSymbolsConversion unicodeSymbolsConversion
statusIndicator.Start(getTranslation(&quot;statusCleaningManualFormatting&quot;),100) statusIndicator.Start(getTranslation(&quot;statusCleaningManualFormatting&quot;),100)
cleanFormatting cleanFormatting
@ -1381,7 +1383,7 @@ Private Sub convertWLLatin2IPHAstra
SrchAttributes(0).Value = Empty SrchAttributes(0).Value = Empty
ReplAttributes(0).Value = Empty ReplAttributes(0).Value = Empty
&apos;Replace macron below &apos;Replace macron below
oSearchString = &quot;(.)\uF0D4&quot; oSearchString = &quot;(.)(\uF0D4)+&quot;
oReplaceString = &quot;$1̱&quot; oReplaceString = &quot;$1̱&quot;
&apos;from WL &apos;from WL
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
@ -1390,7 +1392,7 @@ Private Sub convertWLLatin2IPHAstra
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;Replace dot below &apos;Replace dot below
oSearchString = &quot;(.)\uF0D6&quot; oSearchString = &quot;(.)(\uF0D6)+&quot;
oReplaceString = &quot;$1̣&quot; oReplaceString = &quot;$1̣&quot;
&apos;from WL &apos;from WL
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
@ -1399,16 +1401,25 @@ Private Sub convertWLLatin2IPHAstra
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;replace macron &apos;replace macron
oSearchString = &quot;(.)\uF0F4&quot; oSearchString = &quot;(.)(\uF0F4)+&quot;
oReplaceString = &quot;$1̄&quot; oReplaceString = &quot;$1̄&quot;
&apos;from WL &apos;from WL
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;from unicode to remove direct formatting &apos;from unicode to remove direct formatting
oSearchString = &quot;(.)\u0304&quot; oSearchString = &quot;(.)\u0304&quot;
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;replace space
oSearchString = &quot;\uF020&quot;
oReplaceString = &quot; &quot;
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;replace comma
oSearchString = &quot;\uF02C&quot;
oReplaceString = &quot;,&quot;
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;replace accent &apos;replace accent
oSearchString = &quot;(.)\uF0F1&quot; oSearchString = &quot;(.)(\uF0F1)+&quot;
oReplaceString = &quot;$1́&quot; oReplaceString = &quot;$1́&quot;
ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false) ReplaceFormatting(oSearchString,oReplaceString,SrchAttributes,ReplAttributes, false)
&apos;from unicode to remove direct formatting &apos;from unicode to remove direct formatting