writerfilter/source/ooxml/model.xml | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
New commits:
commit 333e6446a8472c5e4681aa6eee38e824255e7c7a
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Sep 3 16:14:29 2014 +0200
Clean up remaining duplicated xmlns namespace alias definitions
Change-Id: I0a8550f8f80d017c6c7578f14382d2704d800c46
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 8dd15d4..cc826d5 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -26,6 +26,8 @@
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing";
+ xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";
+ xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
xmlns:xml="http://www.w3.org/XML/1998/namespace";>
<token tokenid="ooxml:shape"/>
<token tokenid="ooxml:token"/>
@@ -8367,7 +8369,7 @@
</element>
</define>
<define name="wsp">
- <element
xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
name="wps:wsp">
+ <element name="wps:wsp">
<ref name="CT_WordprocessingShape"/>
</element>
</define>
@@ -8380,7 +8382,7 @@
</element>
</define>
<define name="wgp">
- <element
xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";
name="wpg:wgp">
+ <element name="wpg:wgp">
<ref name="CT_WordprocessingGroup"/>
</element>
</define>
@@ -8419,19 +8421,19 @@
<resource name="chart" resource="Shape">
<element name="c:chart" tokenid="ooxml:c_chart"/>
</resource>
- <resource
xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
name="CT_WordprocessingShape" resource="Shape">
+ <resource name="CT_WordprocessingShape" resource="Shape">
<element name="wps:cNvSpPr"
tokenid="ooxml:CT_WordprocessingShape_cNvSpPr"/>
<element name="wps:spPr" tokenid="ooxml:CT_WordprocessingShape_spPr"/>
</resource>
<resource name="wsp" resource="Shape">
- <element
xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape";
name="wps:wsp" tokenid="ooxml:wps_wsp"/>
+ <element name="wps:wsp" tokenid="ooxml:wps_wsp"/>
</resource>
- <resource
xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";
name="CT_WordprocessingGroup" resource="Shape">
+ <resource name="CT_WordprocessingGroup" resource="Shape">
<element name="wpg:cNvGrpSpPr"
tokenid="ooxml:CT_WordprocessingGroup_cNvGrpSpPr"/>
<element name="wpg:grpSpPr"
tokenid="ooxml:CT_WordprocessingGroup_grpSpPr"/>
</resource>
<resource name="wgp" resource="Shape">
- <element
xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup";
name="wpg:wgp" tokenid="ooxml:wpg_wgp"/>
+ <element name="wpg:wgp" tokenid="ooxml:wpg_wgp"/>
</resource>
</namespace>
commit 1a32b23ed82b13a51b2509eb7af1b6d54c2d40b8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Sep 3 16:11:42 2014 +0200
Clean up duplicated xmlns:wp14 definitions
Change-Id: I4fb7dfb3a8c401aa34ded7d5d93a1b7b88e7278e
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 2f5363a..8dd15d4 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -25,6 +25,7 @@
xmlns:rng="http://relaxng.org/ns/structure/1.0";
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
+
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing";
xmlns:xml="http://www.w3.org/XML/1998/namespace";>
<token tokenid="ooxml:shape"/>
<token tokenid="ooxml:token"/>
@@ -6674,7 +6675,7 @@
<namespace name="dml-wordprocessingDrawing"
file="dml-wordprocessingDrawing.rng">
<start name="inline"/>
<start name="anchor"/>
- <grammar
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing";
xmlns="http://relaxng.org/ns/structure/1.0";
ns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";>
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0";
ns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";>
<!-- ISO RELAX NG Schema -->
<include href="dml-graphicalObject.rng"/>
<include href="dml-documentProperties.rng"/>
@@ -7024,7 +7025,7 @@
<attribute name="b" tokenid="ooxml:CT_EffectExtent_b"/>
</resource>
<resource name="ST_WrapDistance" resource="Integer"/>
- <resource
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing";
name="CT_Inline" resource="Properties">
+ <resource name="CT_Inline" resource="Properties">
<element name="extent" tokenid="ooxml:CT_Inline_extent"/>
<element name="effectExtent" tokenid="ooxml:CT_Inline_effectExtent"/>
<element name="docPr" tokenid="ooxml:CT_Inline_docPr"/>
@@ -7122,7 +7123,7 @@
<attribute name="relativeFrom" tokenid="ooxml:CT_PosV_relativeFrom"/>
</resource>
<resource name="ST_EditId" resource="Hex"/>
- <resource
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing";
name="CT_Anchor" resource="Properties">
+ <resource name="CT_Anchor" resource="Properties">
<element name="simplePos" tokenid="ooxml:CT_Anchor_simplePos_elem"/>
<element name="positionH" tokenid="ooxml:CT_Anchor_positionH"/>
<element name="positionV" tokenid="ooxml:CT_Anchor_positionV"/>
commit 35c0afc34e622bfb64e271060cb95fc10e688c1e
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Sep 3 16:08:01 2014 +0200
Clean up duplicated xmlns:w14 definitions
Change-Id: I9283da66c5b88ea73062b7f5bd5ca3f695e12732
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 1298207..2f5363a 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24,6 +24,7 @@
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships";
xmlns:rng="http://relaxng.org/ns/structure/1.0";
xmlns:v="urn:schemas-microsoft-com:vml"
+ xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
xmlns:xml="http://www.w3.org/XML/1998/namespace";>
<token tokenid="ooxml:shape"/>
<token tokenid="ooxml:token"/>
@@ -10608,7 +10609,7 @@
<start name="styles"/>
<start name="document"/>
<start name="glossaryDocument"/>
- <grammar
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main";
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math";
xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships";
xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";
xmlns="http://relaxng.org/ns/structure/1.0";
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main";
attributeFormDefault="qualified">
+ <grammar
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main";
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math";
xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships";
xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";
xmlns="http://relaxng.org/ns/structure/1.0";
ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main";
attributeFormDefault="qualified">
<include href="shared-math.rng"/>
<include href="dml-wordprocessingDrawing.rng"/>
<include href="shared-relationshipReference.rng"/>
@@ -17910,7 +17911,7 @@
<attribute name="eastAsiaTheme" tokenid="ooxml:CT_Fonts_eastAsiaTheme"/>
<attribute name="cstheme" tokenid="ooxml:CT_Fonts_cstheme"/>
</resource>
- <resource name="EG_RPrBase"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
resource="Properties">
+ <resource name="EG_RPrBase" resource="Properties">
<element name="rStyle" tokenid="ooxml:EG_RPrBase_rStyle"/>
<element name="rFonts" tokenid="ooxml:EG_RPrBase_rFonts"/>
<element name="b" tokenid="ooxml:EG_RPrBase_b"/>
@@ -18001,7 +18002,7 @@
<attribute name="xpath" tokenid="ooxml:CT_DataBinding_xpath"/>
<attribute name="storeItemID"
tokenid="ooxml:CT_DataBinding_storeItemID"/>
</resource>
- <resource xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
name="CT_SdtPr" resource="Properties">
+ <resource name="CT_SdtPr" resource="Properties">
<element name="rPr" tokenid="ooxml:CT_SdtPr_rPr"/>
<element name="alias" tokenid="ooxml:CT_SdtPr_alias"/>
<element name="lock" tokenid="ooxml:CT_SdtPr_lock"/>
commit 4fcee18f277b02b0cdc069e35827884b93649124
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Sep 3 16:06:27 2014 +0200
Clean up duplicated xmlns:v namespace aliases
Change-Id: Idc3b19b0d52f46ab74e7061bb81939ae5ca5eca4
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index eccb19d..1298207 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23,6 +23,7 @@
xmlns:lc="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas";
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships";
xmlns:rng="http://relaxng.org/ns/structure/1.0";
+ xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:xml="http://www.w3.org/XML/1998/namespace";>
<token tokenid="ooxml:shape"/>
<token tokenid="ooxml:token"/>
@@ -9470,7 +9471,7 @@
<start name="column"/>
<start name="clippath"/>
<start name="fill"/>
- <grammar xmlns:v="urn:schemas-microsoft-com:vml"
xmlns="http://relaxng.org/ns/structure/1.0";
ns="urn:schemas-microsoft-com:office:office" >
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0";
ns="urn:schemas-microsoft-com:office:office" >
<!-- ISO RELAX NG Schema -->
<include href="vml-main.rng"/>
<!-- External schema:
http://schemas.openxmlformats.org/officeDocument/2006/relationships -->
@@ -10607,7 +10608,7 @@
<start name="styles"/>
<start name="document"/>
<start name="glossaryDocument"/>
- <grammar
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main";
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math";
xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships";
xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";
xmlns="http://relaxng.org/ns/structure/1.0";
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
xmlns:v="urn:schemas-microsoft-com:vml"
ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main";
attributeFormDefault="qualified">
+ <grammar
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main";
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math";
xmlns:rel="http://schemas.openxmlformats.org/officeDocument/2006/relationships";
xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing";
xmlns="http://relaxng.org/ns/structure/1.0";
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml";
ns="http://schemas.openxmlformats.org/wordprocessingml/2006/main";
attributeFormDefault="qualified">
<include href="shared-math.rng"/>
<include href="dml-wordprocessingDrawing.rng"/>
<include href="shared-relationshipReference.rng"/>
@@ -17437,7 +17438,7 @@
<attribute name="shapeid" tokenid="ooxml:CT_Control_shapeid"/>
<attribute name="r:id" tokenid="ooxml:CT_Control_r_id"/>
</resource>
- <resource xmlns:v="urn:schemas-microsoft-com:vml" name="CT_Background"
resource="Properties">
+ <resource name="CT_Background" resource="Properties">
<attribute name="color" tokenid="ooxml:CT_Background_color"/>
<attribute name="themeColor" tokenid="ooxml:CT_Background_themeColor"/>
<attribute name="themeTint" tokenid="ooxml:CT_Background_themeTint"/>
@@ -18865,7 +18866,7 @@
<action name="end" action="setLastSectionGroup"/>
<action name="end" action="endSectionGroup"/>
</resource>
- <resource xmlns:v="urn:schemas-microsoft-com:vml" name="CT_ShapeDefaults"
resource="Properties">
+ <resource name="CT_ShapeDefaults" resource="Properties">
<element name="v:fill" tokenid="ooxml:CT_ShapeDefaults_v_fill"/>
<element name="v:stroke" tokenid="ooxml:CT_ShapeDefaults_v_stroke"/>
<element name="v:textbox" tokenid="ooxml:CT_ShapeDefaults_v_textbox"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
