[Libreoffice-commits] core.git: 2 commits - writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Sep 3 00:53:48 PDT 2014
writerfilter/source/ooxml/model.xml | 51 ++++++++++++++++++------------------
1 file changed, 26 insertions(+), 25 deletions(-)
New commits:
commit 31c9f6ef804150a2f5a7bcc14b11fc0eef9c8d6b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Sep 3 09:46:22 2014 +0200
Clean up duplicated xmlns:lc definitions
Change-Id: I173b69d61f9b0677ee178a32e18910343f216b71
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index b43e73d..eccb19d 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -20,6 +20,7 @@
xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart"
xmlns:dgm="http://schemas.openxmlformats.org/drawingml/2006/diagram"
+ 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:xml="http://www.w3.org/XML/1998/namespace">
@@ -8340,7 +8341,7 @@
</element>
</define>
<define name="lockedCanvas">
- <element xmlns:lc="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" name="lc:lockedCanvas">
+ <element name="lc:lockedCanvas">
<ref name="CT_GvmlGroupShape"/>
</element>
</define>
@@ -8407,7 +8408,7 @@
<element name="a:grpSpPr" tokenid="ooxml:CT_GvmlGroupShape_grpSpPr"/>
</resource>
<resource name="lockedCanvas" resource="Shape">
- <element xmlns:lc="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" name="lc:lockedCanvas" tokenid="ooxml:lc_lockedCanvas"/>
+ <element name="lc:lockedCanvas" tokenid="ooxml:lc_lockedCanvas"/>
</resource>
<resource name="CT_Chart" resource="Shape">
<attribute name="r:id" tokenid="ooxml:CT_RelId_chart"/>
commit ccb91a23385951a1df67af986572672a36db714e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Sep 3 09:38:57 2014 +0200
Remove unused xmlns:xs namespace aliases
Change-Id: I3f58f9d59ef635883e734aaa91cab0716f49abf3
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index b81c1e0..b43e73d 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -55,7 +55,7 @@
<start name="themeOverride"/>
<start name="themeManager"/>
<start name="hlinkClick"/>
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="dml-baseStylesheet.rng"/>
<!-- start = theme | themeOverride | themeManager | hlinkClick -->
@@ -232,7 +232,7 @@
</grammar>
</namespace>
<namespace name="dml-shape3DLighting" file="dml-shape3DLighting.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<define name="ST_LightRigDirection">
<choice>
<!-- Top Left -->
@@ -382,7 +382,7 @@
</grammar>
</namespace>
<namespace name="dml-shape3DStyles" file="dml-shape3DStyles.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="dml-shapeGeometry.rng"/>
<define name="ST_BevelPresetType">
@@ -536,7 +536,7 @@
</resource>
</namespace>
<namespace name="dml-shape3DCamera" file="dml-shape3DCamera.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<define name="ST_PresetCameraType">
<choice>
<!-- Legacy Oblique Top Left -->
@@ -748,7 +748,7 @@
</resource>
</namespace>
<namespace name="dml-baseStylesheet" file="dml-baseStylesheet.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<define name="ST_ColorSchemeIndex">
<choice>
@@ -1004,7 +1004,7 @@
</resource>
</namespace>
<namespace name="dml-textCharacter" file="dml-textCharacter.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="dml-shapeEffects.rng"/>
<include href="dml-shapeLineProperties.rng"/>
@@ -1262,7 +1262,7 @@
</resource>
</namespace>
<namespace name="dml-shapeEffects" file="dml-shapeEffects.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- start = blip -->
<define name="CT_AlphaBiLevelEffect">
<attribute name="thresh">
@@ -2274,7 +2274,7 @@
</resource>
</namespace>
<namespace name="dml-shapeLineProperties" file="dml-shapeLineProperties.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="dml-shapeEffects.rng"/>
<define name="ST_LineEndType">
@@ -2546,7 +2546,7 @@
</resource>
</namespace>
<namespace name="dml-shapeProperties" file="dml-shapeProperties.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="dml-shape3DStyles.rng"/>
<include href="dml-shape3DScene.rng"/>
@@ -2603,7 +2603,7 @@
</resource>
</namespace>
<namespace name="dml-baseTypes" file="dml-baseTypes">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="shared-relationshipReference.rng"/>
<define name="CT_OfficeArtExtension">
@@ -3758,7 +3758,7 @@
<resource name="ST_DrawingElementId" resource="Integer"/>
</namespace>
<namespace name="dml-documentProperties" file="dml-documentProperties.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<include href="dml-shapeGeometry.rng"/>
<define name="AG_Locking">
@@ -3976,7 +3976,7 @@
</namespace>
<namespace name="dml-graphicalObject" file="dml-graphicalObject.rng">
<start name="graphic"/>
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<!-- ISO RELAX NG Schema -->
<!-- start = graphic -->
<define name="CT_GraphicalObjectData">
@@ -4115,7 +4115,7 @@
<start name="numSpacing"/>
<start name="stylisticSets"/>
<start name="cntxtAlts"/>
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" attributeFormDefault="qualified">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.microsoft.com/office/word/2010/wordml" attributeFormDefault="qualified">
<define name="ST_SchemeColorVal">
<choice>
<value>bg1</value>
@@ -5337,7 +5337,7 @@
</resource>
</namespace>
<namespace name="a14" file="a14.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" 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/drawingml/2010/main">
<!-- Simple types -->
<define name="ST_ArtisticEffectParam10">
<data type="integer"/>
@@ -5658,7 +5658,7 @@
</grammar>
</namespace>
<namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/main">
<define name="ST_ShapeType">
<choice>
<!-- Line Shape -->
@@ -6671,7 +6671,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:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing">
+ <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">
<!-- ISO RELAX NG Schema -->
<include href="dml-graphicalObject.rng"/>
<include href="dml-documentProperties.rng"/>
@@ -7151,7 +7151,7 @@
</namespace>
<namespace name="sml-customXmlMappings" file="sml-customXmlMappings-rng">
<start name="schemaLibrary"/>
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/schemaLibrary/2006/main">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/schemaLibrary/2006/main">
<!-- ISO RELAX NG Schema -->
<!-- start = schemaLibrary -->
<define name="CT_Schema">
@@ -7180,7 +7180,7 @@
<namespace name="shared-math" file="shared-math.rng">
<start name="oMathPara"/>
<start name="oMath"/>
- <grammar xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/math" attributeFormDefault="qualified">
+ <grammar xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/math" attributeFormDefault="qualified">
<!-- ISO RELAX NG Schema -->
<include href="wml.rng"/>
<!-- start = mathPr | oMathPara | oMath -->
@@ -8241,7 +8241,7 @@
</resource>
</namespace>
<namespace name="shared-relationshipReference" file="shared-relationshipReference.rng">
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/officeDocument/2006/relationships">
<!-- ISO RELAX NG Schema -->
<define name="id">
<attribute name="id">
@@ -8453,7 +8453,7 @@
<start name="polyline"/>
<start name="rect"/>
<start name="roundrect"/>
- <grammar xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wvml="urn:schemas-microsoft-com:office:word" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:p="urn:schemas-microsoft-com:office:powerpoint" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:vml">
+ <grammar xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wvml="urn:schemas-microsoft-com:office:word" xmlns:p="urn:schemas-microsoft-com:office:powerpoint" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:vml">
<!-- ISO RELAX NG Schema -->
<include href="vml-officeDrawing.rng"/>
<!-- External schema: http://schemas.openxmlformats.org/wordprocessingml/2006/main -->
@@ -9469,7 +9469,7 @@
<start name="column"/>
<start name="clippath"/>
<start name="fill"/>
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:office" >
+ <grammar xmlns:v="urn:schemas-microsoft-com:vml" 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 -->
@@ -10445,7 +10445,7 @@
<start name="borderbottom"/>
<start name="wrap"/>
<start name="anchorlock"/>
- <grammar xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:word">
+ <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="urn:schemas-microsoft-com:office:word">
<!-- ISO RELAX NG Schema -->
<!-- start = bordertop | borderleft | borderright | borderbottom | wrap | anchorlock -->
<define name="bordertop">
@@ -10606,7 +10606,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:xs="http://www.w3.org/2001/XMLSchema" 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" xmlns:v="urn:schemas-microsoft-com:vml" 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"/>
More information about the Libreoffice-commits
mailing list