[Libreoffice-commits] mso-dumper.git: 14 commits - Makefile msodumper/docrecord.py msodumper/docstream.py msodumper/emfrecord.py msodumper/msometa.py msodumper/vsdstream.py test/doc test/vsd-test.py vsd-dump.py
Miklos Vajna
vmiklos at collabora.co.uk
Fri Apr 17 07:08:11 PDT 2015
Makefile | 1 +
msodumper/docrecord.py | 5 +++--
msodumper/docstream.py | 5 ++---
msodumper/emfrecord.py | 13 +++++--------
msodumper/msometa.py | 11 ++---------
msodumper/vsdstream.py | 7 -------
test/doc/test.py | 4 ++--
test/vsd-test.py | 7 +++----
vsd-dump.py | 3 +--
9 files changed, 19 insertions(+), 37 deletions(-)
New commits:
commit adeaf7ba72f0cb5202fd7d521b389368a615613b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 16:02:34 2015 +0200
vsdstream: unsed imports
diff --git a/msodumper/vsdstream.py b/msodumper/vsdstream.py
index 95fca0c..8b0a5eb 100644
--- a/msodumper/vsdstream.py
+++ b/msodumper/vsdstream.py
@@ -6,14 +6,7 @@
#
import ole
-import ctypes
-import struct
from docdirstream import DOCDirStream
-import docrecord
-import globals
-import sys
-import os
-import bisect
from msometa import SummaryInformationStream
from msometa import DocumentSummaryInformationStream
commit eb5c33cd921726dce603673e79001303cc11a09c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 16:06:13 2015 +0200
vsd-dump: unused variable
diff --git a/vsd-dump.py b/vsd-dump.py
index cb18e8d..9f9b13a 100755
--- a/vsd-dump.py
+++ b/vsd-dump.py
@@ -31,9 +31,8 @@ class VSDDumper:
def main(args):
- exname, args = args[0], args[1:]
params = globals.Params()
- dumper = VSDDumper(args[0], params)
+ dumper = VSDDumper(args[1], params)
dumper.dump()
if __name__ == '__main__':
commit cb4ba398da1d7cc7545ce21bda913d9fb38316ed
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 16:05:16 2015 +0200
vsd-test: GUID is now in msometa
diff --git a/test/vsd-test.py b/test/vsd-test.py
index b08f141..a5fac0c 100755
--- a/test/vsd-test.py
+++ b/test/vsd-test.py
@@ -16,7 +16,7 @@ sys.path.append(sys.path[0] + "/..")
import msodumper.docdirstream
import msodumper.globals
-import msodumper.vsdstream
+import msodumper.msometa
import time
@@ -47,7 +47,7 @@ class OLEStream(msodumper.docdirstream.DOCDirStream):
print '<RightSiblingID value="0x%x"/>' % RightSiblingID
ChildID = self.readuInt32()
print '<ChildID value="0x%x"/>' % ChildID
- msodumper.vsdstream.GUID(self, "CLSID").dump()
+ msodumper.msometa.GUID(self, "CLSID").dump()
StateBits = self.readuInt32()
print '<StateBits value="0x%x"/>' % StateBits
FILETIME(self, "CreationTime").dump()
@@ -131,8 +131,7 @@ class OLEDumper:
def main(args):
- exname, args = args[0], args[1:]
- dumper = OLEDumper(args[0])
+ dumper = OLEDumper(args[1])
dumper.dump()
if __name__ == '__main__':
commit 10eb696fe4662559a9d08c33d362ebc14327490c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 16:03:43 2015 +0200
doc-test: unused variables
diff --git a/test/doc/test.py b/test/doc/test.py
index 55d9819..9f64f9d 100755
--- a/test/doc/test.py
+++ b/test/doc/test.py
@@ -50,7 +50,7 @@ class Test(unittest.TestCase):
"""This test just makes sure that all files in the 'pass' directory are
dumped without problems."""
- for dirname, dirnames, filenames in os.walk('pass'):
+ for dirname, dummy, filenames in os.walk('pass'):
for filename in filenames:
if filename.endswith(".doc"):
self.dump(os.path.join(dirname, filename).replace('.doc', ''))
@@ -116,7 +116,7 @@ class Test(unittest.TestCase):
self.assertEqual('This is a comment.\\x0D', comments[0].findall('transformed')[0].attrib['value'])
self.assertEqual('This is also commented.\\x0D', comments[1].findall('transformed')[0].attrib['value'])
- commentStarts = self.root.findall('stream[@name="WordDocument"]/fib/fibRgFcLcbBlob/lcbPlcfAtnBkf/plcfBkf/aCP')
+ # commentStarts = self.root.findall('stream[@name="WordDocument"]/fib/fibRgFcLcbBlob/lcbPlcfAtnBkf/plcfBkf/aCP')
commentEnds = self.root.findall('stream[@name="WordDocument"]/fib/fibRgFcLcbBlob/lcbPlcfAtnBkl/plcfBkl/aCP')
# The first comment covers Hello\x05, the second covers This\x05.
commit bb801ae3bbfcf5bf71df03d7d189395509c73e64
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 16:00:36 2015 +0200
msometa: unsed imports
diff --git a/msodumper/msometa.py b/msodumper/msometa.py
index 5f245f9..ef9f64b 100644
--- a/msodumper/msometa.py
+++ b/msodumper/msometa.py
@@ -5,15 +5,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-import ole
-import ctypes
-import struct
from docdirstream import DOCDirStream
-import docrecord
import globals
-import sys
-import os
-import bisect
PIDDSI = {
commit 8e35000af592910dd3d45fada6886443b94171f1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:59:47 2015 +0200
msometa: unsed variables
diff --git a/msodumper/msometa.py b/msodumper/msometa.py
index 2afd8fa..5f245f9 100644
--- a/msodumper/msometa.py
+++ b/msodumper/msometa.py
@@ -269,7 +269,7 @@ class CodePageString(DOCDirStream):
print '<%s type="CodePageString">' % self.name
self.printAndSet("Size", self.readuInt32())
bytes = []
- for i in range(self.Size):
+ for dummy in range(self.Size):
c = self.readuInt8()
if c == 0:
break
@@ -305,7 +305,7 @@ class GUID(DOCDirStream):
Data2 = self.readuInt16()
Data3 = self.readuInt16()
Data4 = []
- for i in range(8):
+ for dummy in range(8):
Data4.append(self.readuInt8())
value = "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x" % (Data1, Data2, Data3, Data4[0], Data4[1], Data4[2], Data4[3], Data4[4], Data4[5], Data4[6], Data4[7])
print '<%s type="GUID" value="%s"/>' % (self.name, value)
commit ed6cfdcfd9245acdbb69eb1e3cf886a8368d3e5f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:57:21 2015 +0200
emfrecord: unsed import
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index b590210..3d49ea1 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -8,7 +8,6 @@
from docdirstream import DOCDirStream
import wmfrecord
import base64
-import textwrap
# The FormatSignature enumeration defines valuesembedded data in EMF records.
commit 6818c9333d3014b992aef923e884dbadd7c65d4f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:56:57 2015 +0200
run the emf test on 'make check'
diff --git a/Makefile b/Makefile
index 768c967..1715b73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
check:
cd test/doc && ./test.py
+ cd test/emf && ./test.py
pep8 --ignore=E501 msodumper/msometa.py
pep8 --ignore=E501 doc-dump.py msodumper/doc{dirstream,record,sprm,stream}.py test/doc/test.py
pep8 --ignore=E501 emf-dump.py msodumper/{emf,wmf}record.py
commit 5705ae48990ee915c7b53b0c0f37fdf5cd491b6a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:56:02 2015 +0200
emfrecord: unused variables
diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py
index 4ed10b1..b590210 100644
--- a/msodumper/emfrecord.py
+++ b/msodumper/emfrecord.py
@@ -147,7 +147,6 @@ class LogBrushEx(EMFRecord):
self.name = name
def dump(self):
- posOrig = self.pos
print '<%s>' % self.name
self.printAndSet("BrushStyle", self.readuInt32(), dict=wmfrecord.BrushStyle)
wmfrecord.ColorRef(self, "Color").dump()
@@ -382,7 +381,7 @@ class EmrPolygon16(EMFRecord):
self.printAndSet("Count", self.readuInt32(), hexdump=False)
print '<aPoints>'
for i in range(self.Count):
- wmfrecord.PointS(self, "aPoint").dump()
+ wmfrecord.PointS(self, "aPoint%d" % i).dump()
print '</aPoints>'
assert self.pos - posOrig == self.Size
@@ -401,7 +400,7 @@ class EmrPolypolygon16(EMFRecord):
self.printAndSet("Count", self.readuInt32(), hexdump=False)
print '<PolygonPointCounts>'
for i in range(self.NumberOfPolygons):
- self.printAndSet("PolygonPointCount", self.readuInt32(), hexdump=False)
+ self.printAndSet("PolygonPointCount%d" % i, self.readuInt32(), hexdump=False)
print '</PolygonPointCounts>'
print '<aPoints>'
for i in range(self.Count):
@@ -423,7 +422,7 @@ class EmrPolylineto16(EMFRecord):
self.printAndSet("Count", self.readuInt32(), hexdump=False)
print '<aPoints>'
for i in range(self.Count):
- wmfrecord.PointS(self, "aPoint").dump()
+ wmfrecord.PointS(self, "aPoint%d" % i).dump()
print '</aPoints>'
assert self.pos - posOrig == self.Size
@@ -441,7 +440,7 @@ class EmrPolybezierto16(EMFRecord):
self.printAndSet("Count", self.readuInt32(), hexdump=False)
print '<aPoints>'
for i in range(self.Count):
- wmfrecord.PointS(self, "aPoint").dump()
+ wmfrecord.PointS(self, "aPoint%d" % i).dump()
print '</aPoints>'
assert self.pos - posOrig == self.Size
@@ -609,7 +608,6 @@ class EmrExtcreatepen(EMFRecord):
EMFRecord.__init__(self, parent)
def dump(self):
- posOrig = self.pos
self.printAndSet("Type", self.readuInt32())
self.printAndSet("Size", self.readuInt32(), hexdump=False)
self.printAndSet("ihPen", self.readuInt32(), hexdump=False)
@@ -691,7 +689,7 @@ class RegionData(EMFRecord):
header = RegionDataHeader(self)
header.dump()
for i in range(header.CountRects):
- wmfrecord.RectL(self, "Data").dump()
+ wmfrecord.RectL(self, "Data%d" % i).dump()
print '</%s>' % self.name
self.parent.pos = self.pos
commit 64c444cb1fe65bf41c609155986156253dcdbe30
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:39:51 2015 +0200
docstream: Unused import
diff --git a/msodumper/docstream.py b/msodumper/docstream.py
index 7b9244e..e7f8776 100644
--- a/msodumper/docstream.py
+++ b/msodumper/docstream.py
@@ -7,7 +7,6 @@
import ole
import ctypes
-import struct
from docdirstream import DOCDirStream
import docrecord
import globals
commit 9ce5312b0ee2791061d8d26efe77c9312354633d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:39:14 2015 +0200
docstream: Bad indentation
diff --git a/msodumper/docstream.py b/msodumper/docstream.py
index b455cea..7b9244e 100644
--- a/msodumper/docstream.py
+++ b/msodumper/docstream.py
@@ -37,8 +37,8 @@ class DOCFile:
sys.exit(0)
def initWW8(self):
- self.header = ole.Header(self.chars, self.params)
- self.pos = self.header.parse()
+ self.header = ole.Header(self.chars, self.params)
+ self.pos = self.header.parse()
def __getDirectoryObj(self):
obj = self.header.getDirectory()
commit b913b9ea3a234197368c9620cab4014e9c82759b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:38:17 2015 +0200
docrecord: unused import
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 2886401..4b6dc4f 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -5,7 +5,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-import struct
import locale
import globals
from docdirstream import DOCDirStream
commit a6f30c14e49231808119d141b45a6e7d38defd17
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:37:42 2015 +0200
LSTF.dump: Unused variable 'i'
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index facda1c..2886401 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -3859,7 +3859,7 @@ class LSTF(DOCDirStream):
self.printAndSet("lsid", self.readInt32())
self.printAndSet("tplc", self.readInt32())
for i in range(9):
- print '<rgistdPara value="%s"/>' % self.readInt16()
+ print '<rgistdPara index="%d" value="%s"/>' % (i, self.readInt16())
buf = self.readuInt8()
self.printAndSet("fSimpleList", self.getBit(buf, 0))
self.printAndSet("unused1", self.getBit(buf, 1))
commit 32d0af7a5ad79b4dce1f92257c4486683641de53
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Apr 17 15:35:06 2015 +0200
FFID.dump: Attributes defined outside __init__
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index d904d34..facda1c 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -2778,6 +2778,8 @@ class FFID(DOCDirStream):
def __init__(self, bytes, offset):
DOCDirStream.__init__(self, bytes)
self.pos = offset
+ self.unused1 = None
+ self.unused2 = None
def dump(self):
self.ffid = self.readuInt8()
More information about the Libreoffice-commits
mailing list