[Libreoffice-commits] .: 3 commits - src/docdirstream.py src/msodraw.py

[Miklos Vajna]

 src/docdirstream.py |    2 -
 src/msodraw.py      |   54 ++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 39 insertions(+), 17 deletions(-)

New commits:
commit e5337747b5c606aca4f2f1a42f2cca0503bee5bf
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue May 7 16:44:36 2013 +0200

    quote stream names

diff --git a/src/docdirstream.py b/src/docdirstream.py
index bc89ab1..ba94936 100644
--- a/src/docdirstream.py
+++ b/src/docdirstream.py
@@ -128,7 +128,7 @@ class DOCDirStream:
         return (byte & (1 << bitNumber)) >> bitNumber
 
     def dump(self):
-        print '<stream name="%s" size="%s"/>' % (globals.encodeName(self.name), self.size)
+        print '<stream name="%s" size="%s"/>' % (self.quoteAttr(globals.encodeName(self.name)), self.size)
 
     # compat methods to make msodraw happy
     def readUnsignedInt(self, size):
commit 3e6842847927664cd217cd4046c1eb2f545e6c46
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue May 7 16:41:33 2013 +0200

    msodraw: implement CXStyle::dumpXml()

diff --git a/src/msodraw.py b/src/msodraw.py
index 0017796..b19a5a7 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -346,6 +346,10 @@ class FOPT:
             styleName = globals.getValueOrUnknown(FOPT.CXStyle.style, prop.value)
             recHdl.appendLine(indent(level) + "connector style: %s (0x%8.8X)"%(styleName, prop.value))
 
+        def dumpXml(self, recHdl, prop):
+            styleName = globals.getValueOrUnknown(FOPT.CXStyle.style, prop.value)
+            recHdl.appendLine('<cxstyle name="%s" value="0x%8.8X"/>' % (styleName, prop.value))
+
     class FillColor:
 
         def appendLines (self, recHdl, prop, level):
commit 4cd40de8d2fc4bf7e7c4310a51addd3a3dd69bcb
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Tue May 7 16:29:15 2013 +0200

    msodraw: implement TextBoolean::dumpXml()

diff --git a/src/msodraw.py b/src/msodraw.py
index 0a30f71..0017796 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -298,23 +298,41 @@ class FOPT:
 
     class TextBoolean:
 
+        def __parseBytes(self, prop):
+            self.A = (prop.value & 0x00000001) != 0
+            self.B = (prop.value & 0x00000002) != 0
+            self.C = (prop.value & 0x00000004) != 0
+            self.D = (prop.value & 0x00000008) != 0
+            self.E = (prop.value & 0x00000010) != 0
+            self.F = (prop.value & 0x00010000) != 0
+            self.G = (prop.value & 0x00020000) != 0
+            self.H = (prop.value & 0x00040000) != 0
+            self.I = (prop.value & 0x00080000) != 0
+            self.J = (prop.value & 0x00100000) != 0
+
         def appendLines (self, recHdl, prop, level):
-            A = (prop.value & 0x00000001) != 0
-            B = (prop.value & 0x00000002) != 0
-            C = (prop.value & 0x00000004) != 0
-            D = (prop.value & 0x00000008) != 0
-            E = (prop.value & 0x00000010) != 0
-            F = (prop.value & 0x00010000) != 0
-            G = (prop.value & 0x00020000) != 0
-            H = (prop.value & 0x00040000) != 0
-            I = (prop.value & 0x00080000) != 0
-            J = (prop.value & 0x00100000) != 0
-            recHdl.appendLineBoolean(indent(level) + "fit shape to text",     B)
-            recHdl.appendLineBoolean(indent(level) + "auto text margin",      D)
-            recHdl.appendLineBoolean(indent(level) + "select text",           E)
-            recHdl.appendLineBoolean(indent(level) + "use fit shape to text", G)
-            recHdl.appendLineBoolean(indent(level) + "use auto text margin",  I)
-            recHdl.appendLineBoolean(indent(level) + "use select text",       J)
+            self.__parseBytes(prop)
+            recHdl.appendLineBoolean(indent(level) + "fit shape to text",     self.B)
+            recHdl.appendLineBoolean(indent(level) + "auto text margin",      self.D)
+            recHdl.appendLineBoolean(indent(level) + "select text",           self.E)
+            recHdl.appendLineBoolean(indent(level) + "use fit shape to text", self.G)
+            recHdl.appendLineBoolean(indent(level) + "use auto text margin",  self.I)
+            recHdl.appendLineBoolean(indent(level) + "use select text",       self.J)
+
+        def dumpXml(self, recHdl, prop):
+            self.__parseBytes(prop)
+            recHdl.appendLine('<textBooleanProperties>')
+            recHdl.appendLine('<fUsefSelectText value="%s"/>' % self.A)
+            recHdl.appendLine('<fUsefAutoTextMargin value="%s"/>' % self.B)
+            recHdl.appendLine('<unused2 value="%s"/>' % self.C)
+            recHdl.appendLine('<fUsefFitShapeToText value="%s"/>' % self.D)
+            recHdl.appendLine('<unused3 value="%s"/>' % self.E)
+            recHdl.appendLine('<fSelectText value="%s"/>' % self.F)
+            recHdl.appendLine('<fAutoTextMargin value="%s"/>' % self.G)
+            recHdl.appendLine('<unused5 value="%s"/>' % self.H)
+            recHdl.appendLine('<fFitShapeToText value="%s"/>' % self.I)
+            recHdl.appendLine('<unused6 value="%s"/>' % self.J)
+            recHdl.appendLine('</textBooleanProperties>')
 
     class CXStyle:
         style = [