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

[Miklos Vajna]

 oox/source/token/namespaces.txt              |    2 +-
 writerfilter/source/ooxml/modelpreprocess.py |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 23b49f2390b3d551a52caf06496d8aadf1920bf8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Aug 19 08:17:34 2014 +0200

    writerfilter: fail on mistyped namespace URL's
    
    And also fix one typo detected by this new check.
    
    Change-Id: Iaa7a4bb0b6dc3f81e5dd0b352584029cfed4ffbb

diff --git a/oox/source/token/namespaces.txt b/oox/source/token/namespaces.txt
index 0cbae45..98792d0 100644
--- a/oox/source/token/namespaces.txt
+++ b/oox/source/token/namespaces.txt
@@ -74,7 +74,7 @@ wps                     http://schemas.microsoft.com/office/word/2010/wordproces
 wpg                     http://schemas.microsoft.com/office/word/2010/wordprocessingGroup
 wp14                    http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing
 w14                     http://schemas.microsoft.com/office/word/2010/wordml
-a14                     http://schemas.microsoft.com/office/drawingml/2010/main
+a14                     http://schemas.microsoft.com/office/drawing/2010/main
 
 # extlst namespaces
 
diff --git a/writerfilter/source/ooxml/modelpreprocess.py b/writerfilter/source/ooxml/modelpreprocess.py
index 9af2c3b..3c14199 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -70,10 +70,7 @@ def check(model):
 def preprocess(model):
     for i in model.getElementsByTagName("namespace-alias"):
         name = i.getAttribute("name")
-        if name in list(ooxUrlIds.keys()):
-            i.setAttribute("id", ooxUrlIds[name])
-        else:
-            i.setAttribute("id", ooxAliasIds[i.getAttribute("alias")])
+        i.setAttribute("id", ooxUrlIds[name])
         namespaceAliases[name] = i.getAttribute("alias")
 
     for i in model.getElementsByTagName("namespace"):