[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/ooxml/modelpreprocess.py |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 4e0d84c2c1c47740d9229f18e067ef7523519782
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Aug 30 13:23:55 2014 +0200

    writerfilter: fix namespace of CT_SaveThroughXslt's r:id
    
    We only tried to read "id", not "r:id".
    
    Change-Id: I35580fda05841d8c8a11b961016ec4be5059c5f8

diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py
index 11112f5..a8f232a 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)