From 7ee4a43c491990229ae2f71469670a82baaf17a4 Mon Sep 17 00:00:00 2001 From: Georgy Litvinov Date: Tue, 4 Feb 2020 16:51:57 +0100 Subject: [PATCH] Fix for subscript/superscript conversion for 6.2 and lower --- IPHRedaction/Clean.xba | 64 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/IPHRedaction/Clean.xba b/IPHRedaction/Clean.xba index b27dda8..3c08a68 100644 --- a/IPHRedaction/Clean.xba +++ b/IPHRedaction/Clean.xba @@ -1,6 +1,6 @@ -Sub mark11 +Sub mark12 End Sub @@ -863,6 +863,30 @@ Private Sub fromTextSubscript convertEnclosuresToFormat(CHR(872), styleNames, styleValues) End Sub +Private Sub toTextSuperscriptOld + styleNames = Array("CharEscapementHeight","CharEscapement") + styleValues = Array(58,101) + convertFormatToEnclosure(CHR(871), styleNames, styleValues) +End Sub + +Private Sub fromTextSuperscriptOld + styleNames = Array("CharEscapementHeight","CharEscapement") + styleValues = Array(58,101) + convertEnclosuresToFormat(CHR(871), styleNames, styleValues) +End Sub + +Private Sub toTextSubscriptOld + styleNames = Array("CharEscapementHeight","CharEscapement") + styleValues = Array(58,-101) + convertFormatToEnclosure(CHR(872), styleNames, styleValues) +End Sub + +Private Sub fromTextSubscriptOld + styleNames = Array("CharEscapementHeight","CharEscapement") + styleValues = Array(58,-101) + convertEnclosuresToFormat(CHR(872), styleNames, styleValues) +End Sub + Private Sub toTextSparce styleNames = Array("CharKerning") For i=70 To 70 @@ -881,19 +905,43 @@ End Sub Private Sub convertFormattingToText + Dim version As String + Dim smallNum As String + Dim bigNum As String + version = Trim(getVersion()) + bigNum = Left(version, 1) + smallNum = Right(version, 1) toTextBold toTextItalic toTextStrikeout toTextUnderline - toTextSuperscript - toTextSubscript + If CInt(bigNum) < 6 OR (CInt(bigNum) = 6 AND CInt(smallNum < 3) ) Then + toTextSuperscriptOld + toTextSubscriptOld + Else + toTextSuperscript + toTextSubscript + EndIf + toTextSparce End Sub Private Sub convertFormattingFromText + Dim version As String + version = Trim(getVersion()) + Dim smallNum As String + Dim bigNum As String + version = Trim(getVersion()) + bigNum = Left(version, 1) + smallNum = Right(version, 1) fromTextSparce - fromTextSuperscript - fromTextSubscript + If CInt(bigNum) < 6 OR (CInt(bigNum) = 6 AND CInt(smallNum < 3) ) Then + fromTextSuperscriptOld + fromTextSubscriptOld + Else + fromTextSuperscript + fromTextSubscript + EndIf fromTextUnderline fromTextStrikeout fromTextItalic @@ -1024,5 +1072,11 @@ Private Sub convertWLLatin2IPHAstra replaceFontsInStyles( "WL LatinAllIn1Goth", newFontName) End Sub +Function getVersion + GlobalScope.BasicLibraries.LoadLibrary("Tools") + Dim oProduct As Object + oProduct=GetRegistryKeyContent("org.openoffice.Setup/Product") + getVersion=oProduct.getByName("ooSetupVersion") +End Function \ No newline at end of file