[Libreoffice-commits] .: src/docrecord.py src/docstream.py

[Miklos Vajna]

 src/docrecord.py |    7 ++++---
 src/docstream.py |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit db7cb080392f8a5a9681909671d63b4888288755
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Sun Jan 6 11:06:42 2013 +0100

    don't throw on word2000 docs

diff --git a/src/docrecord.py b/src/docrecord.py
index 4f5c11a..c1e4b2a 100644
--- a/src/docrecord.py
+++ b/src/docrecord.py
@@ -1452,7 +1452,7 @@ class Dop(DOCDirStream):
         elif self.fib.nFibNew == 0x0112:
             Dop2007(self).dump()
         else:
-            print """<todo what="Dop.dump() doesn't know how to handle nFibNew = %s">""" % hex(self.nFibNew)
+            print """<todo what="Dop.dump() doesn't know how to handle nFibNew = %s"/>""" % hex(self.fib.nFibNew)
         print '</dop>'
 
 class FFID(DOCDirStream):
@@ -1741,8 +1741,9 @@ class STSHI(DOCDirStream):
         self.pos += self.stshif.size
         if self.pos - posOrig < self.size:
             self.printAndSet("ftcBi", self.readuInt16())
-            stshiLsd = StshiLsd(self.bytes, self, self.pos)
-            stshiLsd.dump()
+            if self.pos - posOrig < self.size:
+                stshiLsd = StshiLsd(self.bytes, self, self.pos)
+                stshiLsd.dump()
         print '</stshi>'
 
 class LPStshi(DOCDirStream):
diff --git a/src/docstream.py b/src/docstream.py
index 0eee1d2..a29b9c6 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -89,7 +89,7 @@ class WordDocumentStream(DOCDirStream):
         if self.nFibNew == 0x0112:
             self.dumpFibRgCswNewData2007("fibRgCswNewData2007")
         else:
-            print """<todo what="dumpFibRgCswNew() doesn't know how to handle nFibNew = %s">""" % hex(self.nFibNew)
+            print """<todo what="dumpFibRgCswNew() doesn't know how to handle nFibNew = %s"/>""" % hex(self.nFibNew)
         print '</%s>' % name
 
     def __dumpFibRgCswNewData2000(self):