[Libreoffice-commits] core.git: 3 commits - writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Aug 4 12:32:42 PDT 2014
writerfilter/source/ooxml/model.xml | 66 +++++++++++++-----------------------
1 file changed, 25 insertions(+), 41 deletions(-)
New commits:
commit f77981e3c89f428c648da1a550f8d36344e1a927
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Aug 4 21:23:27 2014 +0200
fix ref names
Change-Id: Iae8afadf78a54ec0938de487b78c9c3f14cdbcf8
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index b6f985c..0a574d3 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -12869,10 +12869,10 @@
<define name="AlternateContent">
<element name="AlternateContent">
<oneOrMore>
- <ref name="choice"/>
+ <ref name="Choice"/>
</oneOrMore>
<optional>
- <ref name="fallback"/>
+ <ref name="Fallback"/>
</optional>
</element>
</define>
commit cd7963b0aa03d95f0e106a51a3c643a241e500ad
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Aug 4 20:55:59 2014 +0200
reference to non-existing defines
Change-Id: Iaa99b8ff6ffa85616c2db47f14682a653b156398
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 63895ec..b6f985c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -262,17 +262,6 @@
<element name="spPr">
<ref name="CT_ShapeProperties"/>
</element>
- <element name="bodyPr">
- <ref name="CT_TextBodyProperties"/>
- </element>
- <element name="lstStyle">
- <ref name="CT_TextListStyle"/>
- </element>
- <optional>
- <element name="style">
- <ref name="CT_ShapeStyle"/>
- </element>
- </optional>
<optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
@@ -450,11 +439,6 @@
<ref name="CT_LightRig"/>
</element>
<optional>
- <element name="backdrop">
- <ref name="CT_Backdrop"/>
- </element>
- </optional>
- <optional>
<element name="extLst">
<ref name="CT_OfficeArtExtensionList"/>
</element>
commit f8197e1db8c00bb91b5216e5a4b939089f8e6d07
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Aug 4 20:51:59 2014 +0200
ref names have no namespaces
Change-Id: Ie6290bbaf2d2982520de33136c787f818e437de8
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml
index 0555ea9..63895ec 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -6323,7 +6323,7 @@
<define name="CT_PictureEffectCement">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="crackSpacing">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6333,7 +6333,7 @@
<define name="CT_PictureEffectChalkSketch">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam4"/>
@@ -6343,7 +6343,7 @@
<define name="CT_PictureEffectCrisscrossEtching">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam4"/>
@@ -6353,7 +6353,7 @@
<define name="CT_PictureEffectCutout">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="numberOfShades">
<ref name="ST_ArtisticEffectParam6"/>
@@ -6363,7 +6363,7 @@
<define name="CT_PictureEffectFilmGrain">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="grainSize">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6373,7 +6373,7 @@
<define name="CT_PictureEffectGlass">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6383,7 +6383,7 @@
<define name="CT_PictureEffectGlowDiffused">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="intensity">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6393,7 +6393,7 @@
<define name="CT_PictureEffectGlowEdges">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="smoothness">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6403,7 +6403,7 @@
<define name="CT_PictureEffectLightScreen">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="gridSize">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6413,7 +6413,7 @@
<define name="CT_PictureEffectLineDrawing">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pencilSize">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6423,7 +6423,7 @@
<define name="CT_PictureEffectMarker">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="size">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6433,7 +6433,7 @@
<define name="CT_PictureEffectMosiaicBubbles">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6443,7 +6443,7 @@
<define name="CT_PictureEffectPaintStrokes">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="intensity">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6453,7 +6453,7 @@
<define name="CT_PictureEffectPaintBrush">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="brushSize">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6463,7 +6463,7 @@
<define name="CT_PictureEffectPastelsSmooth">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6473,7 +6473,7 @@
<define name="CT_PictureEffectPencilGrayscale">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pencilSize">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6483,7 +6483,7 @@
<define name="CT_PictureEffectPencilSketch">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="pressure">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6493,7 +6493,7 @@
<define name="CT_PictureEffectPhotocopy">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="detail">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6503,7 +6503,7 @@
<define name="CT_PictureEffectPlasticWrap">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="smoothness">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6513,7 +6513,7 @@
<define name="CT_PictureEffectTexturizer">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="scaling">
<ref name="ST_ArtisticEffectParam100"/>
@@ -6523,7 +6523,7 @@
<define name="CT_PictureEffectWatercolorSponge">
<optional>
<attribute name="trans">
- <ref name="a:ST_PositiveFixedPercentage"/>
+ <ref name="ST_PositiveFixedPercentage"/>
</attribute>
<attribute name="brushSize">
<ref name="ST_ArtisticEffectParam10"/>
@@ -6533,10 +6533,10 @@
<define name="CT_PictureEffectBrightnessContrast">
<optional>
<attribute name="bright">
- <ref name="a:ST_FixedPercentage"/>
+ <ref name="ST_FixedPercentage"/>
</attribute>
<attribute name="contrast">
- <ref name="a:ST_FixedPercentage"/>
+ <ref name="ST_FixedPercentage"/>
</attribute>
</optional>
</define>
More information about the Libreoffice-commits
mailing list