From 8b6ce55b90558703a8748c30690f6d5ecaf60d66 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 19 Aug 2014 23:21:48 +0200
Subject: [PATCH] writerfilter: remove now unused namespace-alias elements

Change-Id: If58b3a9f5b1d79d164bb1c2a7c18aa4f99f00ca8
---
 writerfilter/documentation/ooxml/model.rng | 17 ------------
 writerfilter/source/ooxml/model.xml        | 30 ----------------------
 2 files changed, 47 deletions(-)

diff --git a/writerfilter/documentation/ooxml/model.rng b/writerfilter/documentation/ooxml/model.rng
index 7c6c2fcbf46b..6f365ff6e913 100644
--- a/writerfilter/documentation/ooxml/model.rng
+++ b/writerfilter/documentation/ooxml/model.rng
@@ -221,9 +221,6 @@ documentation for that file. The schema has two parts:
   -->
   <define name="model-element">
     <element name="model">
-      <oneOrMore>
-        <ref name="namespace-alias-element"/>
-      </oneOrMore>
       <oneOrMore>
         <ref name="token-element"/>
       </oneOrMore>
@@ -233,20 +230,6 @@ documentation for that file. The schema has two parts:
     </element>
   </define>
 
-  <!--
-  A namespace-alias element defines an alias for an URI. Multiple URI's
-  can have the same alias, that's how both strict and transitional OOXML is
-  supported by the same tokenizer.
-  -->
-  <define name="namespace-alias-element">
-    <element name="namespace-alias">
-      <!-- The URI of the namespace, e.g. http://schemas.openxmlformats.org/wordprocessingml/2006/main -->
-      <attribute name="name"/>
-      <!-- The alias of the namespace, e.g. w14 -->
-      <attribute name="alias"/>
-    </element>
-  </define>
-
   <!--
   A token element can explicitly define a token. This allows generating
   such a token in the tokenizers and handling it in the domain mapper. Ideally
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 964a1fa374fa..296419639508 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17,36 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <model xmlns:rng="http://relaxng.org/ns/structure/1.0">
-  <namespace-alias name="http://www.w3.org/XML/1998/namespace" alias="xml"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships" alias="officeRel"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/officeDocument/relationships" alias="officeRel"/>
-  <namespace-alias name="urn:schemas-microsoft-com:office:office" alias="vmlOffice"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" alias="officeRelTheme"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" alias="dmlWordDr"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing" alias="dmlWordDr"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/main" alias="dml"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/main" alias="dml"/>
-  <namespace-alias name="urn:schemas-microsoft-com:vml" alias="vml"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="dmlPicture"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/picture" alias="dmlPicture"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="dmlDiagram"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/diagram" alias="dmlDiagram"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="dmlLockedCanvas"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/lockedCanvas" alias="dmlLockedCanvas"/>
-  <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" alias="wps"/>
-  <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" alias="wpg"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/chart" alias="dmlChart"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/chart" alias="dmlChart"/>
-  <namespace-alias name="urn:schemas-microsoft-com:office:word" alias="vmlWord"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/wordprocessingml/2006/main" alias="doc"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/wordprocessingml/main" alias="doc"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/math" alias="officeMath"/>
-  <namespace-alias name="http://purl.oclc.org/ooxml/officeDocument/math" alias="officeMath"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/schemaLibrary/2006/main" alias="schema"/>
-  <namespace-alias name="http://schemas.openxmlformats.org/markup-compatibility/2006" alias="mce"/>
-  <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" alias="wp14"/>
-  <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordml" alias="w14"/>
-  <namespace-alias name="http://schemas.microsoft.com/office/drawing/2010/main" alias="a14"/>
   <token tokenid="ooxml:shape"/>
   <token tokenid="ooxml:token"/>
   <token tokenid="ooxml:inputstream"/>