Fix conversion to hex in ODG report macro

This commit is contained in:
Georgy Litvinov 2020-11-07 20:27:10 +01:00
parent ef1fdec3ac
commit 876008a5c5

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="Validation" script:language="StarBasic">Sub markval14
<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Validation" script:language="StarBasic">Sub markval15
End Sub
@ -728,9 +728,11 @@ Function getCharsInFont(fontName As String) As String
Dim enum1Element As Object
Dim enum2 As Object
Dim thisPortion As Object
Dim fontChar As Long
Dim fontChar As String
Dim groupCount As Long
Dim groupElement As Object
Dim charString As String
Dim charNum As Long
pages = ThisComponent.getDrawPages()
pagesCount = pages.getCount()
For i = 0 To pagesCount - 1
@ -750,7 +752,9 @@ Function getCharsInFont(fontName As String) As String
If thisPortion.CharFontName = fontName Then
resultString = thisPortion.String
For k = 0 To Len(resultString) - 1
fontChar = Hex(Asc(Mid(resultString,k+1,1)))
charString = Mid(resultString,k+1,1)
charNum = Asc(charString)
fontChar = Hex(charNum)
If NOT IsInArray(resultArray,fontChar) Then
AddToArray(resultArray(), fontChar)
AddToArray(pageNums(), i + 1)