diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-06-16 15:41:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-16 15:45:53 +0100 |
commit | 5f7e3ad041ddf022f6b0feb11fac1debbcf835b2 (patch) | |
tree | 0c586d77142e1bb7e4c72ceb8d87f39c25a974a3 /source/text/sbasic/shared/03090202.xhp | |
parent | 02b56e7da2dba0f2cbc1847f8c52bc7ade6a8e32 (diff) |
Recover lost basic in help indentation
regression from...
commit 6614bedceadcc07ec082c5e926107f27903bda5c
Date: Mon Jan 25 20:07:10 2016 +0100
fix validation errors by round-trip through helpauthoring extension
with git show 6614bedceadcc07ec082c5e926107f27903bda5c | ~/recoverindent.py
import fileinput
import re
import sys
added = []
removed = []
filename = ""
def processlastfile(filename, added, removed):
if len(added) != len(removed):
print "BROKEN"
sys.exit(-2)
if len(removed):
f = open(filename, "rw")
linestring = open(filename, "r").read()
start = 0
for x in range(0, len(added)):
if added[x] == removed[x]:
continue
if added[x].strip() != removed[x].strip():
print "BROKEN"
sys.exit(-2)
if filename == "source/text/sbasic/shared/03080301.xhp" and x == 6:
print "skipping special hunk", removed[x], "in source/text/sbasic/shared/03080301.xhp"
else:
start = linestring.find(added[x], start)
if start == -1:
print "BROKEN"
sys.exit(-2)
linestring = linestring[0:start] + removed[x] + linestring[start + len(added[x]):]
start = start + len(removed[x])
open(filename, "w").write(linestring)
for line in fileinput.input():
if line.startswith("--- a/"):
if filename is not "":
processlastfile(filename, added, removed)
added = []
removed = []
filename = line[6:-1]
elif "role=\"bascode\"" in line:
m = re.search('>(.+?)<', line)
code = m.group(1)
if line.startswith("-"):
removed.append(code)
else:
added.append(code)
processlastfile(filename, added, removed)
which puts the code back the way it was, except for one string
which had changed and was fixed manually afterwards
Change-Id: Ic67abf36bb5d27be58a51ebbf5022830f56dcb37
Diffstat (limited to 'source/text/sbasic/shared/03090202.xhp')
-rw-r--r-- | source/text/sbasic/shared/03090202.xhp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/source/text/sbasic/shared/03090202.xhp b/source/text/sbasic/shared/03090202.xhp index 4ac247a567..eefb033f33 100644 --- a/source/text/sbasic/shared/03090202.xhp +++ b/source/text/sbasic/shared/03090202.xhp @@ -76,28 +76,28 @@ <paragraph id="par_idm1340516080" role="bascode" localize="false" xml-lang="en-US">Dim iCount As Integer</paragraph> <paragraph id="par_idm1340514848" role="bascode" localize="false" xml-lang="en-US">Dim iCount2 As Integer</paragraph> <paragraph id="par_idm1340513616" role="bascode" localize="false" xml-lang="en-US">Dim sTemp As String</paragraph> -<paragraph id="par_id3155767" role="bascode" xml-lang="en-US"> sEntry(0) = "Jerry"</paragraph> -<paragraph id="par_id3153711" role="bascode" xml-lang="en-US"> sEntry(1) = "Patty"</paragraph> -<paragraph id="par_id3148993" role="bascode" xml-lang="en-US"> sEntry(2) = "Kurt"</paragraph> -<paragraph id="par_id3156382" role="bascode" xml-lang="en-US"> sEntry(3) = "Thomas"</paragraph> -<paragraph id="par_id3155174" role="bascode" xml-lang="en-US"> sEntry(4) = "Michael"</paragraph> -<paragraph id="par_id3166448" role="bascode" xml-lang="en-US"> sEntry(5) = "David"</paragraph> -<paragraph id="par_id3149255" role="bascode" xml-lang="en-US"> sEntry(6) = "Cathy"</paragraph> -<paragraph id="par_id3149565" role="bascode" xml-lang="en-US"> sEntry(7) = "Susie"</paragraph> -<paragraph id="par_id3145148" role="bascode" xml-lang="en-US"> sEntry(8) = "Edward"</paragraph> -<paragraph id="par_id3145229" role="bascode" xml-lang="en-US"> sEntry(9) = "Christine"</paragraph> -<paragraph id="par_idm1340495152" role="bascode" localize="false" xml-lang="en-US"> For iCount = 0 To 9</paragraph> -<paragraph id="par_idm1340493920" role="bascode" localize="false" xml-lang="en-US"> For iCount2 = iCount + 1 To 9</paragraph> -<paragraph id="par_idm1340492672" role="bascode" localize="false" xml-lang="en-US"> If sEntry(iCount) > sEntry(iCount2) Then</paragraph> -<paragraph id="par_idm1340491296" role="bascode" localize="false" xml-lang="en-US"> sTemp = sEntry(iCount)</paragraph> -<paragraph id="par_idm1340490096" role="bascode" localize="false" xml-lang="en-US"> sEntry(iCount) = sEntry(iCount2)</paragraph> -<paragraph id="par_idm1340488832" role="bascode" localize="false" xml-lang="en-US"> sEntry(iCount2) = sTemp</paragraph> -<paragraph id="par_idm1340487584" role="bascode" localize="false" xml-lang="en-US"> End If</paragraph> -<paragraph id="par_idm1340486352" role="bascode" localize="false" xml-lang="en-US"> Next iCount2</paragraph> -<paragraph id="par_idm1340485120" role="bascode" localize="false" xml-lang="en-US"> Next iCount</paragraph> -<paragraph id="par_idm1340483888" role="bascode" localize="false" xml-lang="en-US"> For iCount = 0 To 9</paragraph> -<paragraph id="par_idm1340482656" role="bascode" localize="false" xml-lang="en-US"> Print sEntry(iCount)</paragraph> -<paragraph id="par_idm1340481408" role="bascode" localize="false" xml-lang="en-US"> Next iCount</paragraph> +<paragraph id="par_id3155767" role="bascode" xml-lang="en-US"> sEntry(0) = "Jerry"</paragraph> +<paragraph id="par_id3153711" role="bascode" xml-lang="en-US"> sEntry(1) = "Patty"</paragraph> +<paragraph id="par_id3148993" role="bascode" xml-lang="en-US"> sEntry(2) = "Kurt"</paragraph> +<paragraph id="par_id3156382" role="bascode" xml-lang="en-US"> sEntry(3) = "Thomas"</paragraph> +<paragraph id="par_id3155174" role="bascode" xml-lang="en-US"> sEntry(4) = "Michael"</paragraph> +<paragraph id="par_id3166448" role="bascode" xml-lang="en-US"> sEntry(5) = "David"</paragraph> +<paragraph id="par_id3149255" role="bascode" xml-lang="en-US"> sEntry(6) = "Cathy"</paragraph> +<paragraph id="par_id3149565" role="bascode" xml-lang="en-US"> sEntry(7) = "Susie"</paragraph> +<paragraph id="par_id3145148" role="bascode" xml-lang="en-US"> sEntry(8) = "Edward"</paragraph> +<paragraph id="par_id3145229" role="bascode" xml-lang="en-US"> sEntry(9) = "Christine"</paragraph> +<paragraph id="par_idm1340495152" role="bascode" localize="false" xml-lang="en-US"> For iCount = 0 To 9</paragraph> +<paragraph id="par_idm1340493920" role="bascode" localize="false" xml-lang="en-US"> For iCount2 = iCount + 1 To 9</paragraph> +<paragraph id="par_idm1340492672" role="bascode" localize="false" xml-lang="en-US"> If sEntry(iCount) > sEntry(iCount2) Then</paragraph> +<paragraph id="par_idm1340491296" role="bascode" localize="false" xml-lang="en-US"> sTemp = sEntry(iCount)</paragraph> +<paragraph id="par_idm1340490096" role="bascode" localize="false" xml-lang="en-US"> sEntry(iCount) = sEntry(iCount2)</paragraph> +<paragraph id="par_idm1340488832" role="bascode" localize="false" xml-lang="en-US"> sEntry(iCount2) = sTemp</paragraph> +<paragraph id="par_idm1340487584" role="bascode" localize="false" xml-lang="en-US"> End If</paragraph> +<paragraph id="par_idm1340486352" role="bascode" localize="false" xml-lang="en-US"> Next iCount2</paragraph> +<paragraph id="par_idm1340485120" role="bascode" localize="false" xml-lang="en-US"> Next iCount</paragraph> +<paragraph id="par_idm1340483888" role="bascode" localize="false" xml-lang="en-US"> For iCount = 0 To 9</paragraph> +<paragraph id="par_idm1340482656" role="bascode" localize="false" xml-lang="en-US"> Print sEntry(iCount)</paragraph> +<paragraph id="par_idm1340481408" role="bascode" localize="false" xml-lang="en-US"> Next iCount</paragraph> <paragraph id="par_idm1340480176" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph> </bascode> </body> |