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

[Miklos Vajna]

 writerfilter/CustomTarget_source.mk |    1 -
 writerfilter/source/ooxml/model.xml |   27 ---------------------------
 2 files changed, 28 deletions(-)

New commits:
commit 552f139d2a4785882d68016cbdf2f630c69f6300
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Aug 23 11:29:20 2014 +0200

    writerfilter: remove mce token generator
    
    Commit af7d4a5ebf3e6a09cd2079f241dee16aa22e0276 (n#820503: initial MCE
    support in writerfilter ooxml tokenizer, 2013-07-03) added these, but in
    fact only the namespace-alias part was necessary. Now that oox provides
    the list of namespaces to be registered, it can be removed completely.
    
    Change-Id: If8f1b0c07602a0170c63b53d806a5b466d485747

diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index 2061780..09b2610 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -39,7 +39,6 @@ writerfilter_OOXMLNAMESPACES= \
 	vml-main \
 	vml-officeDrawing \
 	vml-wordprocessingDrawing \
-	mce \
 	wp14 \
 	w14 \
 	a14 \
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 2964196..40beca2 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -10432,33 +10432,6 @@
       <value tokenid="ooxml:Value_vmlOffice_ST_FillType_background">background</value>
     </resource>
   </namespace>
-  <namespace name="mce">
-    <start name="AlternateContent"/>
-    <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/markup-compatibility/2006">
-      <define name="nsList">
-        <choice>
-            <data type="NCName"/>
-        </choice>
-      </define>
-      <define name="AlternateContent">
-        <element name="AlternateContent">
-            <ref name="Choice"/>
-        </element>
-      </define>
-      <define name="Choice">
-        <element name="Choice">
-          <attribute name="Requires">
-            <ref name="nsList"/>
-          </attribute>
-          <text/>
-        </element>
-      </define>
-    </grammar>
-    <resource name="AlternateContent" resource="Value"/>
-    <resource name="Choice" resource="Value">
-      <attribute name="Requires" tokenid="ooxml:mc_Requires"/>
-    </resource>
-  </namespace>
   <namespace name="vml-wordprocessingDrawing" file="vml-wordprocessingDrawing.rng">
     <start name="bordertop"/>
     <start name="borderleft"/>