[Libreoffice-commits] .: 6 commits - src/docrecord.py src/docstream.py
Miklos Vajna
vmiklos at kemper.freedesktop.org
Sat May 4 07:29:25 PDT 2013
src/docrecord.py | 22 +++++++++-------------
src/docstream.py | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
New commits:
commit 0830a4734532a87a1d9a495ba158c8c48c1e534e
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat May 4 16:25:13 2013 +0200
unused parameter
diff --git a/src/docstream.py b/src/docstream.py
index dc36baf..dec8cb6 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -674,11 +674,11 @@ class WordDocumentStream(DOCDirStream):
index = i
return index
- def retrieveText(self, start, end, logicalLength = False):
+ def retrieveText(self, start, end):
"""Deprecated, use retrieveCPs instead."""
plcPcd = self.clx.pcdt.plcPcd
idx = self.__findText(plcPcd, start)
- return plcPcd.aPcd[idx].fc.getTransformedValue(start, end, logicalPositions = False, logicalLength = logicalLength)
+ return plcPcd.aPcd[idx].fc.getTransformedValue(start, end, logicalPositions = False, logicalLength = False)
def retrieveCP(self, cp):
"""Implements 2.4.1 Retrieving Text."""
commit b71e43c41a1551eb5a3df0c1433d0bcc502d8bbe
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat May 4 16:21:36 2013 +0200
PlcFld: use retrieveCPs()
diff --git a/src/docrecord.py b/src/docrecord.py
index 6248265..b46d0b1 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -177,7 +177,6 @@ class PlcFld(DOCDirStream, PLC):
def dump(self):
print '<plcFld type="PlcFld" offset="%d" size="%d bytes">' % (self.pos, self.size)
- offset = self.mainStream.fcMin # 2.8.25: CPs relative to the start of that document part.
pos = self.pos
aFlds = []
for i in range(self.getElements()):
@@ -192,10 +191,10 @@ class PlcFld(DOCDirStream, PLC):
# This is a separator and the previous was a start: display the field instructions.
if aFld.fldch.ch == 0x14 and aFlds[-1][1].fldch.ch == 0x13:
- print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveText(offset + aFlds[-1][0] + 1, offset + value))
+ print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveCPs(aFlds[-1][0] + 1, value))
# This is an end and the previous was a separator: display the field result.
elif aFld.fldch.ch == 0x15 and aFlds[-1][1].fldch.ch == 0x14:
- print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveText(offset + aFlds[-1][0] + 1, offset + value))
+ print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveCPs(aFlds[-1][0] + 1, value))
aFlds.append((value, aFld))
print '</aCP>'
print '</plcFld>'
commit d99496077a43fc1be8af940e3505f355f307bc86
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat May 4 16:18:31 2013 +0200
PlcfGram: use retrieveCPs()
diff --git a/src/docrecord.py b/src/docrecord.py
index 330dad2..6248265 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2419,7 +2419,6 @@ class PlcfGram(DOCDirStream, PLC):
def dump(self):
print '<plcfGram type="PlcfGram" offset="%d" size="%d bytes">' % (self.pos, self.size)
- offset = self.mainStream.fcMin
pos = self.pos
for i in range(self.getElements()):
# aCp
@@ -2432,7 +2431,7 @@ class PlcfGram(DOCDirStream, PLC):
aGrammarSpls = SPLS("GrammarSpls", self, self.getOffset(self.pos, i))
aGrammarSpls.dump()
- print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end, logicalLength = True))
+ print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveCPs(start, end))
print '</aCP>'
print '</plcfGram>'
commit a527473729ccba433fa3adc0b38401dc30647b84
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat May 4 16:17:23 2013 +0200
PlcfSpl: use retrieveCPs()
diff --git a/src/docrecord.py b/src/docrecord.py
index a9ba0b0..330dad2 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -2393,7 +2393,6 @@ class PlcfSpl(DOCDirStream, PLC):
def dump(self):
print '<plcfSpl type="PlcfSpl" offset="%d" size="%d bytes">' % (self.pos, self.size)
- offset = self.mainStream.fcMin
pos = self.pos
for i in range(self.getElements()):
# aCp
@@ -2406,7 +2405,7 @@ class PlcfSpl(DOCDirStream, PLC):
aSpellingSpls = SPLS("SpellingSpls", self, self.getOffset(self.pos, i))
aSpellingSpls.dump()
- print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end, logicalLength = True))
+ print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveCPs(start, end))
print '</aCP>'
print '</plcfSpl>'
commit d0a8cc3c9e74af252efa59831ae0d2bf1087603b
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat May 4 16:14:14 2013 +0200
PlcfandRef: use retrieveCP()
diff --git a/src/docrecord.py b/src/docrecord.py
index f192abd..a9ba0b0 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -872,12 +872,11 @@ class PlcfandRef(DOCDirStream, PLC):
def dump(self):
print '<plcfandRef type="PlcfandRef" offset="%d" size="%d bytes">' % (self.pos, self.size)
- offset = self.mainStream.fcMin
pos = self.pos
for i in range(self.getElements()):
- start = offset + self.getuInt32(pos = pos)
- print '<aCP index="%d" commentEndOffset="%d">' % (i, start)
- print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveText(start, start + 1))
+ start = self.getuInt32(pos = pos)
+ print '<aCP index="%d" commentEnd="%d">' % (i, start)
+ print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveCP(start))
pos += 4
# aATRDPre10
commit 1c04bd8b3b20c67c2a0c3bcc0dd263c291452413
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Sat May 4 16:12:03 2013 +0200
PlcfandTxt: use retrieveCPs()
diff --git a/src/docrecord.py b/src/docrecord.py
index 20c63b4..f192abd 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -851,13 +851,13 @@ class PlcfandTxt(DOCDirStream, PLC):
def dump(self):
print '<plcfandTxt type="PlcfandTxt" offset="%d" size="%d bytes">' % (self.pos, self.size)
- offset = self.mainStream.fcMin + self.mainStream.ccpText + self.mainStream.ccpFtn + self.mainStream.ccpHdd # TODO do this in a better way when headers are handled
+ offset = self.mainStream.ccpText + self.mainStream.ccpFtn + self.mainStream.ccpHdd
pos = self.pos
for i in range(self.getElements() - 1):
start = self.getuInt32(pos = pos)
end = self.getuInt32(pos = pos + 4)
print '<aCP index="%d" start="%d" end="%d">' % (i, start, end)
- print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveText(offset + start, offset + end))
+ print '<transformed value="%s"/>' % self.quoteAttr(self.mainStream.retrieveCPs(offset + start, offset + end))
pos += 4
print '</aCP>'
print '</plcfandTxt>'
More information about the Libreoffice-commits
mailing list