diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-11 18:21:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-11 18:25:25 +0200 |
| commit | aacdc61b5da2f30b16361b8e22ff081352fc69d6 (patch) | |
| tree | a4699299ce6059b63925faefb160165555523277 /writerfilter | |
| parent | 766af75b6e7631690b92964bc21d214d00d54ff0 (diff) | |
remove redundant anyName element
Change-Id: Ib05a4dd232850bb00b66079df53e0679548324e1
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/factoryimpl_ns.py | 5 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 17 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/modelpreprocess.py | 2 |
3 files changed, 4 insertions, 20 deletions
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py b/writerfilter/source/ooxml/factoryimpl_ns.py index 41f9622d0d01..c088ac7b9abb 100644 --- a/writerfilter/source/ooxml/factoryimpl_ns.py +++ b/writerfilter/source/ooxml/factoryimpl_ns.py @@ -114,7 +114,10 @@ def fastNamespace(attrNode): def fastLocalName(attrNode): - return "oox::XML_%s" % attrNode.getAttribute("localname") + if len(attrNode.getAttribute("localname")): + return "oox::XML_%s" % attrNode.getAttribute("localname") + else: + return "oox::XML_TOKEN_COUNT" def fastToken(attrNode): diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 3017c7d21a91..42e7eb11fbf6 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -2632,7 +2632,6 @@ <include href="shared-relationshipReference.rng"/> <define name="CT_OfficeArtExtension"> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> <attribute name="uri"> @@ -4012,7 +4011,6 @@ <ref name="wsp"/> <ref name="wgp"/> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> <attribute name="uri"> @@ -9146,7 +9144,6 @@ <ref name="BUILT_IN_ANY_TYPE"/> </element> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> </choice> @@ -9409,12 +9406,8 @@ <define name="BUILT_IN_ANY_TYPE"> <choice> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> - <attribute> - <anyName/> - </attribute> <text/> </choice> </define> @@ -10415,12 +10408,8 @@ <define name="BUILT_IN_ANY_TYPE"> <choice> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> - <attribute> - <anyName/> - </attribute> <text/> </choice> </define> @@ -12539,7 +12528,6 @@ </define> <define name="CT_PictureBase"> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> </define> @@ -16316,7 +16304,6 @@ </define> <define name="CT_ShapeDefaults"> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> </define> @@ -16602,12 +16589,8 @@ <define name="BUILT_IN_ANY_TYPE"> <choice> <element> - <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> </element> - <attribute> - <anyName/> - </attribute> <text/> </choice> </define> diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py index e20401b57746..9af2c3bcedbe 100644 --- a/writerfilter/source/ooxml/modelpreprocess.py +++ b/writerfilter/source/ooxml/modelpreprocess.py @@ -137,8 +137,6 @@ def preprocess(model): # localname if ":" in j.getAttribute("name"): localname = j.getAttribute("name").split(':')[1] - elif len(j.getElementsByTagName("anyName")): - localname = "TOKEN_COUNT" else: localname = j.getAttribute("name") |