From 1ad53ab31cc4e51a759e1dde56b0d829f64a78b3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 12 Jan 2012 20:26:02 +0530 Subject: [PATCH] Pull from upstream odfpy --- src/odf/namespaces.py | 14 ++++++++++++-- src/odf/opendocument.py | 4 +++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/odf/namespaces.py b/src/odf/namespaces.py index 96ea958e79..cff8a74992 100644 --- a/src/odf/namespaces.py +++ b/src/odf/namespaces.py @@ -20,10 +20,12 @@ TOOLSVERSION = u"ODFPY/0.9.4dev" ANIMNS = u"urn:oasis:names:tc:opendocument:xmlns:animation:1.0" -DBNS = u"urn:oasis:names:tc:opendocument:xmlns:database:1.0" CHARTNS = u"urn:oasis:names:tc:opendocument:xmlns:chart:1.0" +CHARTOOONS = u"http://openoffice.org/2010/chart" CONFIGNS = u"urn:oasis:names:tc:opendocument:xmlns:config:1.0" +CSS3TNS = u"http://www.w3.org/TR/css3-text/" #DBNS = u"http://openoffice.org/2004/database" +DBNS = u"urn:oasis:names:tc:opendocument:xmlns:database:1.0" DCNS = u"http://purl.org/dc/elements/1.1/" DOMNS = u"http://www.w3.org/2001/xml-events" DR3DNS = u"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" @@ -31,6 +33,7 @@ DRAWNS = u"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" FIELDNS = u"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" FONS = u"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" FORMNS = u"urn:oasis:names:tc:opendocument:xmlns:form:1.0" +FORMXNS = u"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" GRDDLNS = u"http://www.w3.org/2003/g/data-view#" KOFFICENS = u"http://www.koffice.org/2005/" MANIFESTNS = u"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" @@ -39,9 +42,9 @@ METANS = u"urn:oasis:names:tc:opendocument:xmlns:meta:1.0" NUMBERNS = u"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" OFFICENS = u"urn:oasis:names:tc:opendocument:xmlns:office:1.0" OFNS = u"urn:oasis:names:tc:opendocument:xmlns:of:1.2" +OOOCNS = u"http://openoffice.org/2004/calc" OOONS = u"http://openoffice.org/2004/office" OOOWNS = u"http://openoffice.org/2004/writer" -OOOCNS = u"http://openoffice.org/2004/calc" PRESENTATIONNS = u"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" RDFANS = u"http://docs.oasis-open.org/opendocument/meta/rdfa#" RPTNS = u"http://openoffice.org/2005/report" @@ -50,8 +53,10 @@ SMILNS = u"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" STYLENS = u"urn:oasis:names:tc:opendocument:xmlns:style:1.0" SVGNS = u"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" TABLENS = u"urn:oasis:names:tc:opendocument:xmlns:table:1.0" +TABLEOOONS = u"http://openoffice.org/2009/table" TEXTNS = u"urn:oasis:names:tc:opendocument:xmlns:text:1.0" XFORMSNS = u"http://www.w3.org/2002/xforms" +XHTMLNS = u"http://www.w3.org/1999/xhtml" XLINKNS = u"http://www.w3.org/1999/xlink" XMLNS = u"http://www.w3.org/XML/1998/namespace" XSDNS = u"http://www.w3.org/2001/XMLSchema" @@ -60,7 +65,9 @@ XSINS = u"http://www.w3.org/2001/XMLSchema-instance" nsdict = { ANIMNS: u'anim', CHARTNS: u'chart', + CHARTOOONS: u'chartooo', CONFIGNS: u'config', + CSS3TNS: u'css3t', DBNS: u'db', DCNS: u'dc', DOMNS: u'dom', @@ -69,6 +76,7 @@ nsdict = { FIELDNS: u'field', FONS: u'fo', FORMNS: u'form', + FORMXNS: u'formx', GRDDLNS: u'grddl', KOFFICENS: u'koffice', MANIFESTNS: u'manifest', @@ -88,9 +96,11 @@ nsdict = { STYLENS: u'style', SVGNS: u'svg', TABLENS: u'table', + TABLEOOONS: u'tableooo', TEXTNS: u'text', XFORMSNS: u'xforms', XLINKNS: u'xlink', + XHTMLNS: u'xhtml', XMLNS: u'xml', XSDNS: u'xsd', XSINS: u'xsi', diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py index 63196382d5..69ada218aa 100644 --- a/src/odf/opendocument.py +++ b/src/odf/opendocument.py @@ -232,7 +232,9 @@ class OpenDocument: """ for e in top.childNodes: if e.nodeType == element.Node.ELEMENT_NODE: - for styleref in ( (DRAWNS,u'style-name'), + for styleref in ( + (CHARTNS,u'style-name'), + (DRAWNS,u'style-name'), (DRAWNS,u'text-style-name'), (PRESENTATIONNS,u'style-name'), (STYLENS,u'data-style-name'),