summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-09-03 16:11:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-09-03 16:20:58 +0200
commit1a32b23ed82b13a51b2509eb7af1b6d54c2d40b8 (patch)
treecc4827dc6a6b0d4dacbfcb20ef1de2f91734dbf5 /writerfilter
parent35c0afc34e622bfb64e271060cb95fc10e688c1e (diff)
Clean up duplicated xmlns:wp14 definitions
Change-Id: I4fb7dfb3a8c401aa34ded7d5d93a1b7b88e7278e
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/model.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 2f5363a46e90..8dd15d4ff7cb 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"/>