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/03102100.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/03102100.xhp')
| -rw-r--r-- | source/text/sbasic/shared/03102100.xhp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/text/sbasic/shared/03102100.xhp b/source/text/sbasic/shared/03102100.xhp index 3b8531ca28..f8f7f0c7fc 100644 --- a/source/text/sbasic/shared/03102100.xhp +++ b/source/text/sbasic/shared/03102100.xhp @@ -84,7 +84,7 @@ <paragraph id="par_idm871051008" role="bascode" localize="false" xml-lang="en-US">Sub ExampleDim1</paragraph> <paragraph id="par_idm871049776" role="bascode" localize="false" xml-lang="en-US">Dim sVar As String</paragraph> <paragraph id="par_idm871048544" role="bascode" localize="false" xml-lang="en-US">Dim iVar As Integer</paragraph> -<paragraph id="par_id3154657" role="bascode" xml-lang="en-US"> sVar = "Office"</paragraph> +<paragraph id="par_id3154657" role="bascode" xml-lang="en-US"> sVar = "Office"</paragraph> <paragraph id="par_idm871045600" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph> <paragraph id="par_idm871044368" role="bascode" localize="false" xml-lang="en-US"> </paragraph> <paragraph id="par_idm871043120" role="bascode" localize="false" xml-lang="en-US">Sub ExampleDim2</paragraph> @@ -92,14 +92,14 @@ <paragraph id="par_idm871040112" role="bascode" localize="false" xml-lang="en-US">Dim stext(20,2) As String</paragraph> <paragraph id="par_id3153782" role="bascode" xml-lang="en-US">Const sDim As String = " Dimension:"</paragraph> <paragraph id="par_idm871037136" role="bascode" localize="false" xml-lang="en-US">For i = 0 To 20</paragraph> -<paragraph id="par_idm871035904" role="bascode" localize="false" xml-lang="en-US"> For ii = 0 To 2</paragraph> -<paragraph id="par_idm871034672" role="bascode" localize="false" xml-lang="en-US"> stext(i,ii) = str(i) & sDim & str(ii)</paragraph> -<paragraph id="par_idm871033392" role="bascode" localize="false" xml-lang="en-US"> Next ii</paragraph> +<paragraph id="par_idm871035904" role="bascode" localize="false" xml-lang="en-US"> For ii = 0 To 2</paragraph> +<paragraph id="par_idm871034672" role="bascode" localize="false" xml-lang="en-US"> stext(i,ii) = str(i) & sDim & str(ii)</paragraph> +<paragraph id="par_idm871033392" role="bascode" localize="false" xml-lang="en-US"> Next ii</paragraph> <paragraph id="par_idm871032160" role="bascode" localize="false" xml-lang="en-US">Next i</paragraph> <paragraph id="par_idm871030928" role="bascode" localize="false" xml-lang="en-US">For i = 0 To 20</paragraph> -<paragraph id="par_idm871029696" role="bascode" localize="false" xml-lang="en-US"> For ii = 0 To 2</paragraph> -<paragraph id="par_idm871028464" role="bascode" localize="false" xml-lang="en-US"> MsgBox stext(i,ii)</paragraph> -<paragraph id="par_idm871027216" role="bascode" localize="false" xml-lang="en-US"> Next ii</paragraph> +<paragraph id="par_idm871029696" role="bascode" localize="false" xml-lang="en-US"> For ii = 0 To 2</paragraph> +<paragraph id="par_idm871028464" role="bascode" localize="false" xml-lang="en-US"> MsgBox stext(i,ii)</paragraph> +<paragraph id="par_idm871027216" role="bascode" localize="false" xml-lang="en-US"> Next ii</paragraph> <paragraph id="par_idm871025984" role="bascode" localize="false" xml-lang="en-US">Next i</paragraph> <paragraph id="par_idm871024752" role="bascode" localize="false" xml-lang="en-US">End Sub</paragraph> </bascode> |