diff --git a/Redaction/Validation.xba b/Redaction/Validation.xba index 3810a2f..7f61ee9 100644 --- a/Redaction/Validation.xba +++ b/Redaction/Validation.xba @@ -1,6 +1,6 @@ -Sub markval12 +Sub markval13 End Sub @@ -602,9 +602,10 @@ Function getODGFontNames() As Variant elementCount = page.getCount() For j = 0 To elementCount - 1 element = page.getByIndex(j) - elementText = element.getText() - enum1 = elementText.createEnumeration() - While enum1.hasMoreElements + If element.supportsService("com.sun.star.drawing.Text") Then + elementText = element.getText() + enum1 = elementText.createEnumeration() + While enum1.hasMoreElements enum1Element = enum1.nextElement If enum1Element.supportsService("com.sun.star.text.Paragraph") Then enum2 = enum1Element.createEnumeration @@ -618,7 +619,8 @@ Function getODGFontNames() As Variant EndIf Wend EndIf - Wend + Wend + EndIf Next j Next i getODGFontNames = fontNames @@ -706,9 +708,10 @@ Function getCharsInFont(fontName As String) As String elementCount = page.getCount() For j = 0 To elementCount - 1 element = page.getByIndex(j) - elementText = element.getText() - enum1 = elementText.createEnumeration() - While enum1.hasMoreElements + If element.supportsService("com.sun.star.drawing.Text") Then + elementText = element.getText() + enum1 = elementText.createEnumeration() + While enum1.hasMoreElements enum1Element = enum1.nextElement If enum1Element.supportsService("com.sun.star.text.Paragraph") Then enum2 = enum1Element.createEnumeration @@ -726,7 +729,8 @@ Function getCharsInFont(fontName As String) As String EndIf Wend EndIf - Wend + Wend + EndIf Next j Next i resultString = "" diff --git a/build.gradle b/build.gradle index 220ce13..21d1b31 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -def releaseVersion = "0.9.2" +def releaseVersion = "0.9.3" task oxt(type: Zip) { dependsOn = [ 'setVersion','setVersionInBasicCode' ] from './' diff --git a/releasenotes.txt b/releasenotes.txt index 7f2d7c7..c8f56ed 100644 --- a/releasenotes.txt +++ b/releasenotes.txt @@ -1,3 +1,4 @@ +0.9.3 Fix for font report function 0.9.2 Font report in Draw added 0.8.6 Validation status indicator added 0.8.4 Added check for headings in footers and headers