diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-30 13:23:55 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-30 13:30:04 +0200 |
| commit | 4e0d84c2c1c47740d9229f18e067ef7523519782 (patch) | |
| tree | eeb9801406d5a52f4ac267a7f119a4cd85bf5e2d | |
| parent | 686ea7add8f6d56fbc741bda0107603d8cefc9b3 (diff) | |
writerfilter: fix namespace of CT_SaveThroughXslt's r:id
We only tried to read "id", not "r:id".
Change-Id: I35580fda05841d8c8a11b961016ec4be5059c5f8
| -rw-r--r-- | writerfilter/source/ooxml/modelpreprocess.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py index 11112f58c666..a8f232a3c443 100644 --- a/writerfilter/source/ooxml/modelpreprocess.py +++ b/writerfilter/source/ooxml/modelpreprocess.py @@ -77,12 +77,7 @@ def preprocess(model): if j.localName == "attribute" and not len(j.getAttribute("name")): continue - if j.parentNode.localName == "resource": - # Outside grammar element, don't inherit namespaces defined there. - localNamespaceAliases = defaultNamespaceAliases() - else: - # Inside grammar element. - localNamespaceAliases = grammarNamespaceAliases.copy() + localNamespaceAliases = grammarNamespaceAliases.copy() parseNamespaceAliases(j.parentNode, localNamespaceAliases) parseNamespaceAliases(j, localNamespaceAliases) |