[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - oox/source writerfilter/source

[Michael Stahl]

 oox/source/token/namespaces-strict.txt |    2 +-
 writerfilter/source/ooxml/model.xml    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5fc827d2d0289d178d227161976eb05117853af9
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 15 21:45:01 2016 +0100

    oox, writerfilter: incorrect a14 namespace
    
    Change-Id: I813ca0510b6cfc26c307c510f3511c01c0f65c85
    (cherry picked from commit 4eee0f8d1180300bd56942ad23321f8f3f1b6177)
    Reviewed-on: https://gerrit.libreoffice.org/21782
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/oox/source/token/namespaces-strict.txt b/oox/source/token/namespaces-strict.txt
index 69eb335..f9a4633 100644
--- a/oox/source/token/namespaces-strict.txt
+++ b/oox/source/token/namespaces-strict.txt
@@ -77,7 +77,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
 p14                     http://schemas.microsoft.com/office/powerpoint/2010/main
 
 # MSO 2012/2013 extensions ---------------------------------------------------------
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 260aa3d..2407a73 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -5342,7 +5342,7 @@
     </resource>
   </namespace>
   <namespace name="a14">
-    <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/drawingml/2010/main">
+    <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/drawing/2010/main">
       <!-- Simple types -->
       <define name="ST_ArtisticEffectParam10">
         <data type="integer"/>