src/msodraw.py | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 165a1135d6986938f91bb699409c0deaf61fa8b9
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Jan 18 16:56:23 2013 +0100
msodraw: add a few more shape prop constants, without actually dumping them
diff --git a/src/msodraw.py b/src/msodraw.py
index 7c6cc3e..f4b887c 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -484,6 +484,17 @@ class FOPT:
0x03BF: ['Group Shape Boolean Properties', GroupShape],
0x0205: ['X Shadow Offset', ShadowOffsetX],
0x01CB: ['Line Width', LineWidth],
+ 0x0186: ['fillBlip'],
+ 0x01C5: ['lineFillBlip'],
+ 0x0080: ['lTxid'],
+ 0x008A: ['hspNext'],
+ 0x0200: ['shadowType'],
+ 0x0201: ['shadowColor'],
+ 0x0207: ['shadowSecondOffsetX'],
+ 0x023F: ['Shadow Style Boolean Properties'],
+ 0x01FF: ['Line Style Boolean Properties'],
+ 0x0304: ['Black-and-white Display Mode'],
+ 0x033F: ['Shape Boolean Properties'],
}
class E:
@@ -522,7 +533,7 @@ class FOPT:
for i in xrange(0, rh.recInstance):
recHdl.appendLine(" "+"-"*57)
prop = self.properties[i]
- if FOPT.propTable.has_key(prop.ID):
+ if FOPT.propTable.has_key(prop.ID) and
len(FOPT.propTable[prop.ID]) > 1:
# We have a handler for this property.
# propData is expected to have two elements: name (0) and
handler (1).
propHdl = FOPT.propTable[prop.ID]
@@ -536,6 +547,8 @@ class FOPT:
recHdl.appendLine(" blip ID: %d"%prop.value)
else:
# regular property value
+ if FOPT.propTable.has_key(prop.ID):
+ recHdl.appendLine(" property name:
%s"%FOPT.propTable[prop.ID][0])
recHdl.appendLine(" property value: 0x%8.8X"%prop.value)
def dumpXml(self, recHdl, model, rh):
@@ -552,7 +565,7 @@ class FOPT:
recHdl.appendLine('<opid fBid="%d"/>' % prop.flagBid)
recHdl.appendLine('<opid fComplex="%d"/>' % prop.flagComplex)
recHdl.appendLine('</opid>')
- if FOPT.propTable.has_key(prop.ID):
+ if FOPT.propTable.has_key(prop.ID) and
len(FOPT.propTable[prop.ID]) > 1:
# We have a handler for this property.
# propData is expected to have two elements: name (0) and
handler (1).
propHdl = FOPT.propTable[prop.ID]
@@ -560,7 +573,10 @@ class FOPT:
propHdl[1]().dumpXml(recHdl, prop)
recHdl.appendLine('</op>')
else:
- recHdl.appendLine('<op value="0x%8.8X"/>' % prop.value)
+ if FOPT.propTable.has_key(prop.ID):
+ recHdl.appendLine('<op name="%s" value="0x%8.8X"/>' %
(FOPT.propTable[prop.ID][0], prop.value))
+ else:
+ recHdl.appendLine('<op value="0x%8.8X"/>' % prop.value)
if prop.flagComplex:
recHdl.appendLine('<todo what="FOPT: fComplex != 0
unhandled"/>')
recHdl.appendLine('</rgfopte>')
commit 8852635b71a013fdad5010895a533b4d12da8f22
Author: Miklos Vajna <vmik...@suse.cz>
Date: Fri Jan 18 16:26:15 2013 +0100
msodraw: dump LineWidth
diff --git a/src/msodraw.py b/src/msodraw.py
index 27b728f..7c6cc3e 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -420,6 +420,14 @@ class FOPT:
def dumpXml(self, recHdl, prop):
recHdl.appendLine('<shadowOffsetX value="%s" inTwips="%s"/>' %
(prop.value, emu_to_twip(prop.value)))
+ class LineWidth:
+
+ def appendLines(self, recHdl, prop, level):
+ recHdl.appendLine(indent(level)+"lineWidth: %s"%prop.value)
+
+ def dumpXml(self, recHdl, prop):
+ recHdl.appendLine('<lineWidth value="%s" inTwips="%s"/>' %
(prop.value, emu_to_twip(prop.value)))
+
class GroupShape:
@@ -475,6 +483,7 @@ class FOPT:
0x0303: ['Connector Shape Style (cxstyle)', CXStyle],
0x03BF: ['Group Shape Boolean Properties', GroupShape],
0x0205: ['X Shadow Offset', ShadowOffsetX],
+ 0x01CB: ['Line Width', LineWidth],
}
class E:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
