Skip to content

C
core
Kaydet (Commit) ef72ed43 authored tarafından Miklos Vajna's avatar Miklos Vajna
Dosyalara gözat
Seçenekler

writerfilter: remove <text> alias for <data type="string"> 

Change-Id: I44630ebc4395b86ae4f44c85d596b589a93b54b0
Reviewed-on: https://gerrit.libreoffice.org/15159Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst d30ac3f4
Show whitespace changes
Inline Side-by-side
Showing with 315 additions and 328 deletions
writerfilter/documentation/ooxml/model.rng
Dosyayı görüntüle @ ef72ed43
......@@ -44,7 +44,6 @@ documentation for that file. The schema has two parts:
<ref name="attribute-element"/>
<ref name="data-element"/>
<ref name="ref-element"/>
<ref name="text-element"/>
</choice>
</oneOrMore>
</element>
......@@ -56,7 +55,7 @@ documentation for that file. The schema has two parts:
Example:
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
-->
<define name="attribute-element">
......@@ -68,7 +67,6 @@ documentation for that file. The schema has two parts:
<choice>
<ref name="data-element"/>
<ref name="ref-element"/>
<ref name="text-element"/>
</choice>
</zeroOrMore>
</element>
......@@ -84,16 +82,6 @@ documentation for that file. The schema has two parts:
</element>
</define>
<!--
Describes that the data used inside the parent (element or attribute) is a
string. It is just a short-hand for <data type="string"/>.
-->
<define name="text-element">
<element name="text" ns="http://relaxng.org/ns/structure/1.0">
<empty/>
</element>
</define>
<!--
Describes an enumeration element: a possible value for an attribute.
-->
......@@ -120,7 +108,6 @@ documentation for that file. The schema has two parts:
<ref name="data-element"/>
<ref name="element-element"/>
<ref name="ref-element"/>
<ref name="text-element"/>
<ref name="value-element"/>
</choice>
</oneOrMore>
......
writerfilter/source/ooxml/factoryimpl_ns.py
Dosyayı görüntüle @ ef72ed43
......@@ -88,7 +88,7 @@ def resourceForAttribute(nsNode, attrNode):
break
if not len(resourceName):
if len(attrNode.getElementsByTagName("text") + [i for i in attrNode.getElementsByTagName("data") if i.getAttribute("type") in ("base64Binary", "string")]):
if len([i for i in attrNode.getElementsByTagName("data") if i.getAttribute("type") in ("base64Binary", "string")]):
resourceName = "String"
elif len([i for i in attrNode.getElementsByTagName("data") if i.getAttribute("type") == "boolean"]):
resourceName = "Boolean"
......
writerfilter/source/ooxml/model.xml
Dosyayı görüntüle @ ef72ed43
......@@ -175,7 +175,7 @@
</define>
<define name="CT_Hyperlink">
<attribute name="r:id">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="theme">
......@@ -3411,10 +3411,10 @@
</define>
<define name="AG_Blob">
<attribute name="r:embed">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:link">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_EmbeddedWAVAudioFile">
......@@ -5648,7 +5648,7 @@
<ref name="CT_PictureEffect"/>
</element>
<attribute name="r:embed">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Photo">
......@@ -7405,7 +7405,7 @@
<define name="CT_Text">
<ref name="ST_String"/>
<attribute name="xml:space">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_R">
......@@ -8248,12 +8248,12 @@
<!-- ISO RELAX NG Schema -->
<define name="id">
<attribute name="id">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="embed">
<attribute name="embed">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="link">
......@@ -8279,7 +8279,7 @@
</define>
<define name="href">
<attribute name="href">
<text/>
<data type="string"/>
</attribute>
</define>
</grammar>
......@@ -8316,16 +8316,16 @@
</define>
<define name="CT_RelIds">
<attribute name="r:dm">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:lo">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:qs">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:cs">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="relIds">
......@@ -8348,7 +8348,7 @@
</define>
<define name="CT_Chart">
<attribute name="r:id">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="chart">
......@@ -8486,20 +8486,20 @@
</define>
<define name="AG_Fill">
<attribute name="filled">
<text/>
<data type="string"/>
</attribute>
<attribute name="fillcolor">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="AG_Chromakey">
<attribute name="chromakey">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="AG_Ext">
<attribute name="ext">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="AG_CoreAttributes">
......@@ -8530,7 +8530,7 @@
<data type="string"/>
</attribute>
<attribute name="print">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="AG_ShapeAttributes">
......@@ -8540,16 +8540,16 @@
<data type="string"/>
</attribute>
<attribute name="stroked">
<text/>
<data type="string"/>
</attribute>
<attribute name="strokecolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="strokeweight">
<data type="string"/>
</attribute>
<attribute name="insetpen">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="AG_OfficeCoreAttributes">
......@@ -8624,75 +8624,75 @@
<data type="string"/>
</attribute>
<attribute name="grayscale">
<text/>
<data type="string"/>
</attribute>
<attribute name="bilevel">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="AG_StrokeAttributes">
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="weight">
<data type="string"/>
</attribute>
<attribute name="color">
<text/>
<data type="string"/>
</attribute>
<attribute name="opacity">
<data type="string"/>
</attribute>
<attribute name="linestyle">
<text/>
<data type="string"/>
</attribute>
<attribute name="miterlimit">
<data type="decimal"/>
</attribute>
<attribute name="joinstyle">
<text/>
<data type="string"/>
</attribute>
<attribute name="endcap">
<text/>
<data type="string"/>
</attribute>
<attribute name="dashstyle">
<data type="string"/>
</attribute>
<attribute name="filltype">
<text/>
<data type="string"/>
</attribute>
<attribute name="src">
<data type="string"/>
</attribute>
<attribute name="imageaspect">
<text/>
<data type="string"/>
</attribute>
<attribute name="imagesize">
<data type="string"/>
</attribute>
<attribute name="imagealignshape">
<text/>
<data type="string"/>
</attribute>
<attribute name="color2">
<text/>
<data type="string"/>
</attribute>
<attribute name="startarrow">
<text/>
<data type="string"/>
</attribute>
<attribute name="startarrowwidth">
<text/>
<data type="string"/>
</attribute>
<attribute name="startarrowlength">
<text/>
<data type="string"/>
</attribute>
<attribute name="endarrow">
<text/>
<data type="string"/>
</attribute>
<attribute name="endarrowwidth">
<text/>
<data type="string"/>
</attribute>
<attribute name="endarrowlength">
<text/>
<data type="string"/>
</attribute>
<attribute name="o:href"/>
<attribute name="o:althref"/>
......@@ -8700,7 +8700,7 @@
<attribute name="o:forcedash"/>
<attribute name="r:id"/>
<attribute name="insetpen">
<text/>
<data type="string"/>
</attribute>
<attribute name="o:relid"/>
</define>
......@@ -8831,7 +8831,7 @@
<ref name="AG_AllCoreAttributes"/>
<ref name="AG_Fill"/>
<attribute name="editas">
<text/>
<data type="string"/>
</attribute>
<attribute name="o:tableproperties"/>
<attribute name="o:tablelimits"/>
......@@ -8896,19 +8896,19 @@
</element>
<ref name="AG_Id"/>
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="color">
<text/>
<data type="string"/>
</attribute>
<attribute name="opacity">
<data type="string"/>
</attribute>
<attribute name="color2">
<text/>
<data type="string"/>
</attribute>
<attribute name="src">
<data type="string"/>
......@@ -8925,7 +8925,7 @@
<data type="string"/>
</attribute>
<attribute name="aspect">
<text/>
<data type="string"/>
</attribute>
<attribute name="colors">
<data type="string"/>
......@@ -8934,7 +8934,7 @@
<data type="decimal"/>
</attribute>
<attribute name="alignshape">
<text/>
<data type="string"/>
</attribute>
<attribute name="focus">
<data type="string"/>
......@@ -8946,16 +8946,16 @@
<data type="string"/>
</attribute>
<attribute name="method">
<text/>
<data type="string"/>
</attribute>
<attribute name="o:detectmouseclick"/>
<attribute name="o:title"/>
<attribute name="o:opacity2"/>
<attribute name="recolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="rotate">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:id"/>
<attribute name="o:relid"/>
......@@ -8986,13 +8986,13 @@
<data type="string"/>
</attribute>
<attribute name="invx">
<text/>
<data type="string"/>
</attribute>
<attribute name="invy">
<text/>
<data type="string"/>
</attribute>
<attribute name="switch">
<text/>
<data type="string"/>
</attribute>
<attribute name="xrange">
<data type="string"/>
......@@ -9009,10 +9009,10 @@
<ref name="AG_ImageAttributes"/>
<ref name="AG_Chromakey"/>
<attribute name="embosscolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="recolortarget">
<text/>
<data type="string"/>
</attribute>
<attribute name="o:href"/>
<attribute name="o:althref"/>
......@@ -9037,25 +9037,25 @@
<data type="string"/>
</attribute>
<attribute name="fillok">
<text/>
<data type="string"/>
</attribute>
<attribute name="strokeok">
<text/>
<data type="string"/>
</attribute>
<attribute name="shadowok">
<text/>
<data type="string"/>
</attribute>
<attribute name="arrowok">
<text/>
<data type="string"/>
</attribute>
<attribute name="gradientshapeok">
<text/>
<data type="string"/>
</attribute>
<attribute name="textpathok">
<text/>
<data type="string"/>
</attribute>
<attribute name="insetpenok">
<text/>
<data type="string"/>
</attribute>
<attribute name="o:connecttype"/>
<attribute name="o:connectlocs"/>
......@@ -9065,16 +9065,16 @@
<define name="CT_Shadow">
<ref name="AG_Id"/>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
<attribute name="obscured">
<text/>
<data type="string"/>
</attribute>
<attribute name="color">
<text/>
<data type="string"/>
</attribute>
<attribute name="opacity">
<data type="string"/>
......@@ -9083,7 +9083,7 @@
<data type="string"/>
</attribute>
<attribute name="color2">
<text/>
<data type="string"/>
</attribute>
<attribute name="offset2">
<data type="string"/>
......@@ -9135,19 +9135,19 @@
<ref name="AG_Id"/>
<ref name="AG_Style"/>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="fitshape">
<text/>
<data type="string"/>
</attribute>
<attribute name="fitpath">
<text/>
<data type="string"/>
</attribute>
<attribute name="trim">
<text/>
<data type="string"/>
</attribute>
<attribute name="xscale">
<text/>
<data type="string"/>
</attribute>
<attribute name="string">
<data type="string"/>
......@@ -9384,7 +9384,7 @@
<element>
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
<text/>
<data type="string"/>
</choice>
</define>
</grammar>
......@@ -9742,19 +9742,19 @@
<data type="string"/>
</attribute>
<attribute name="fill">
<text/>
<data type="string"/>
</attribute>
<attribute name="fillcolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="stroke">
<text/>
<data type="string"/>
</attribute>
<attribute name="strokecolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="allowincell">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Ink">
......@@ -9762,28 +9762,28 @@
<data type="base64Binary"/>
</attribute>
<attribute name="annotation">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SignatureLine">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="issignatureline">
<text/>
<data type="string"/>
</attribute>
<attribute name="id">
<text/>
<data type="string"/>
</attribute>
<attribute name="provid">
<text/>
<data type="string"/>
</attribute>
<attribute name="signinginstructionsset">
<text/>
<data type="string"/>
</attribute>
<attribute name="allowcomments">
<text/>
<data type="string"/>
</attribute>
<attribute name="showsigndate">
<text/>
<data type="string"/>
</attribute>
<attribute name="suggestedsigner">
<data type="string"/>
......@@ -9850,10 +9850,10 @@
<data type="string"/>
</attribute>
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
<attribute name="how">
<text/>
<data type="string"/>
</attribute>
<attribute name="idref">
<data type="string"/>
......@@ -9861,10 +9861,10 @@
</define>
<define name="CT_Proxy">
<attribute name="start">
<text/>
<data type="string"/>
</attribute>
<attribute name="end">
<text/>
<data type="string"/>
</attribute>
<attribute name="idref">
<data type="string"/>
......@@ -9882,13 +9882,13 @@
<data type="integer"/>
</attribute>
<attribute name="autoformat">
<text/>
<data type="string"/>
</attribute>
<attribute name="reverse">
<text/>
<data type="string"/>
</attribute>
<attribute name="autolayout">
<text/>
<data type="string"/>
</attribute>
<attribute name="dgmscalex">
<data type="integer"/>
......@@ -9933,16 +9933,16 @@
<define name="CT_ColorMenu">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="strokecolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="fillcolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="shadowcolor">
<text/>
<data type="string"/>
</attribute>
<attribute name="extrusioncolor">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="skew">
......@@ -10016,7 +10016,7 @@
<data type="string"/>
</attribute>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="offset">
<data type="string"/>
......@@ -10031,13 +10031,13 @@
<define name="CT_Extrusion">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
<attribute name="render">
<text/>
<data type="string"/>
</attribute>
<attribute name="viewpointorigin">
<data type="string"/>
......@@ -10046,7 +10046,7 @@
<data type="string"/>
</attribute>
<attribute name="plane">
<text/>
<data type="string"/>
</attribute>
<attribute name="skewangle">
<data type="float"/>
......@@ -10067,10 +10067,10 @@
<data type="float"/>
</attribute>
<attribute name="lockrotationcenter">
<text/>
<data type="string"/>
</attribute>
<attribute name="autorotationcenter">
<text/>
<data type="string"/>
</attribute>
<attribute name="rotationcenter">
<data type="string"/>
......@@ -10079,10 +10079,10 @@
<data type="string"/>
</attribute>
<attribute name="colormode">
<text/>
<data type="string"/>
</attribute>
<attribute name="color">
<text/>
<data type="string"/>
</attribute>
<attribute name="shininess">
<data type="float"/>
......@@ -10094,7 +10094,7 @@
<data type="string"/>
</attribute>
<attribute name="metal">
<text/>
<data type="string"/>
</attribute>
<attribute name="edge">
<data type="string"/>
......@@ -10103,7 +10103,7 @@
<data type="string"/>
</attribute>
<attribute name="lightface">
<text/>
<data type="string"/>
</attribute>
<attribute name="brightness">
<data type="string"/>
......@@ -10115,7 +10115,7 @@
<data type="string"/>
</attribute>
<attribute name="lightharsh">
<text/>
<data type="string"/>
</attribute>
<attribute name="lightposition2">
<data type="string"/>
......@@ -10124,13 +10124,13 @@
<data type="string"/>
</attribute>
<attribute name="lightharsh2">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Callout">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="type">
<data type="string"/>
......@@ -10139,70 +10139,70 @@
<data type="string"/>
</attribute>
<attribute name="angle">
<text/>
<data type="string"/>
</attribute>
<attribute name="dropauto">
<text/>
<data type="string"/>
</attribute>
<attribute name="drop">
<text/>
<data type="string"/>
</attribute>
<attribute name="distance">
<data type="string"/>
</attribute>
<attribute name="lengthspecified">
<text/>
<data type="string"/>
</attribute>
<attribute name="length">
<data type="string"/>
</attribute>
<attribute name="accentbar">
<text/>
<data type="string"/>
</attribute>
<attribute name="textborder">
<text/>
<data type="string"/>
</attribute>
<attribute name="minusx">
<text/>
<data type="string"/>
</attribute>
<attribute name="minusy">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Lock">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="position">
<text/>
<data type="string"/>
</attribute>
<attribute name="selection">
<text/>
<data type="string"/>
</attribute>
<attribute name="grouping">
<text/>
<data type="string"/>
</attribute>
<attribute name="ungrouping">
<text/>
<data type="string"/>
</attribute>
<attribute name="rotation">
<text/>
<data type="string"/>
</attribute>
<attribute name="cropping">
<text/>
<data type="string"/>
</attribute>
<attribute name="verticies">
<text/>
<data type="string"/>
</attribute>
<attribute name="adjusthandles">
<text/>
<data type="string"/>
</attribute>
<attribute name="text">
<text/>
<data type="string"/>
</attribute>
<attribute name="aspectratio">
<text/>
<data type="string"/>
</attribute>
<attribute name="shapetype">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_OLEObject">
......@@ -10216,7 +10216,7 @@
<data type="string"/>
</element>
<attribute name="Type">
<text/>
<data type="string"/>
</attribute>
<attribute name="ProgID">
<data type="string"/>
......@@ -10225,7 +10225,7 @@
<data type="string"/>
</attribute>
<attribute name="DrawAspect">
<text/>
<data type="string"/>
</attribute>
<attribute name="ObjectID">
<data type="string"/>
......@@ -10234,7 +10234,7 @@
<data type="string"/>
</attribute>
<attribute name="UpdateMode">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Complex">
......@@ -10243,16 +10243,16 @@
<define name="CT_StrokeChild">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="on">
<text/>
<data type="string"/>
</attribute>
<attribute name="weight">
<data type="string"/>
</attribute>
<attribute name="color">
<text/>
<data type="string"/>
</attribute>
<attribute name="color2">
<text/>
<data type="string"/>
</attribute>
<attribute name="opacity">
<data type="string"/>
......@@ -10273,7 +10273,7 @@
<data type="string"/>
</attribute>
<attribute name="insetpen">
<text/>
<data type="string"/>
</attribute>
<attribute name="filltype">
<ref name="ST_FillType"/>
......@@ -10288,7 +10288,7 @@
<data type="string"/>
</attribute>
<attribute name="imagealignshape">
<text/>
<data type="string"/>
</attribute>
<attribute name="startarrow">
<ref name="ST_StrokeArrowType"/>
......@@ -10321,7 +10321,7 @@
<define name="CT_Fill">
<ref name="BUILT_IN_ANY_TYPE"/>
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_Angle">
......@@ -10391,7 +10391,7 @@
<element>
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
<text/>
<data type="string"/>
</choice>
</define>
</grammar>
......@@ -10475,13 +10475,13 @@
</define>
<define name="CT_Border">
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
<attribute name="width">
<data type="positiveInteger"/>
</attribute>
<attribute name="shadow">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="wrap">
......@@ -10719,7 +10719,7 @@
</define>
<define name="CT_MacroName">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_EighthPointMeasure">
......@@ -10733,7 +10733,7 @@
</define>
<define name="CT_String">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_TextScale">
......@@ -10834,7 +10834,7 @@
</define>
<define name="CT_Guid">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_Underline">
......@@ -10885,13 +10885,13 @@
<ref name="ST_HexColor"/>
</attribute>
<attribute name="themeColor">
<text/>
<data type="string"/>
</attribute>
<attribute name="themeTint">
<text/>
<data type="string"/>
</attribute>
<attribute name="themeShade">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_TextEffect">
......@@ -11443,15 +11443,15 @@
</define>
<define name="CT_VerticalAlignRun">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FitText">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
<attribute name="id">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_Em">
......@@ -11850,30 +11850,30 @@
</define>
<define name="CT_WritingStyle">
<attribute name="lang">
<text/>
<data type="string"/>
</attribute>
<attribute name="vendorID">
<text/>
<data type="string"/>
</attribute>
<attribute name="dllVersion">
<text/>
<data type="string"/>
</attribute>
<attribute name="nlCheck">
<text/>
<data type="string"/>
</attribute>
<attribute name="checkStyle">
<text/>
<data type="string"/>
</attribute>
<attribute name="appName">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Proof">
<attribute name="spelling">
<text/>
<data type="string"/>
</attribute>
<attribute name="grammar">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_DocType">
......@@ -11936,25 +11936,25 @@
<ref name="ST_AlgType"/>
</attribute>
<attribute name="cryptAlgorithmSid">
<text/>
<data type="string"/>
</attribute>
<attribute name="cryptSpinCount">
<ref name="ST_DecimalNumber"/>
</attribute>
<attribute name="cryptProvider">
<text/>
<data type="string"/>
</attribute>
<attribute name="algIdExt">
<text/>
<data type="string"/>
</attribute>
<attribute name="algIdExtSource">
<text/>
<data type="string"/>
</attribute>
<attribute name="cryptProviderTypeExt">
<text/>
<data type="string"/>
</attribute>
<attribute name="cryptProviderTypeExtSource">
<text/>
<data type="string"/>
</attribute>
<attribute name="hash">
<data type="base64Binary"/>
......@@ -11977,22 +11977,22 @@
</define>
<define name="CT_MailMergeDocType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_MailMergeDataType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_MailMergeDest">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_MailMergeOdsoFMDFieldType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_TrackChangesView">
......@@ -12113,7 +12113,7 @@
</define>
<define name="CT_MarkupRangeBookmark">
<attribute name="id">
<text/>
<data type="string"/>
</attribute>
<ref name="CT_MarkupRange"/>
</define>
......@@ -12126,25 +12126,25 @@
<define name="CT_BookmarkRange">
<ref name="CT_MarkupRangeBookmark"/>
<attribute name="colFirst">
<text/>
<data type="string"/>
</attribute>
<attribute name="colLast">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Bookmark">
<ref name="CT_BookmarkRange"/>
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_MoveBookmark">
<ref name="CT_Bookmark"/>
<attribute name="author">
<text/>
<data type="string"/>
</attribute>
<attribute name="date">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Comment">
......@@ -12160,7 +12160,7 @@
<define name="CT_TrackChangeNumbering">
<ref name="CT_TrackChange"/>
<attribute name="original">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_TblPrExChange">
......@@ -12330,7 +12330,7 @@
</define>
<define name="CT_TextboxTightWrap">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_PPrBase">
......@@ -12448,10 +12448,10 @@
</define>
<define name="CT_Control">
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
<attribute name="shapeid">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:id">
<ref name="ST_String"/>
......@@ -12463,13 +12463,13 @@
<ref name="ST_HexColor"/>
</attribute>
<attribute name="themeColor">
<text/>
<data type="string"/>
</attribute>
<attribute name="themeTint">
<text/>
<data type="string"/>
</attribute>
<attribute name="themeShade">
<text/>
<data type="string"/>
</attribute>
<element name="v:background">
<ref name="BUILT_IN_ANY_TYPE"/>
......@@ -12491,10 +12491,10 @@
<ref name="CT_Control"/>
</element>
<attribute name="dxaOrig">
<text/>
<data type="string"/>
</attribute>
<attribute name="dyaOrig">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Picture">
......@@ -12518,13 +12518,13 @@
</element>
<ref name="EG_PContent"/>
<attribute name="instr">
<text/>
<data type="string"/>
</attribute>
<attribute name="fldLock">
<ref name="ST_OnOff"/>
</attribute>
<attribute name="dirty">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_FldCharType">
......@@ -12555,7 +12555,7 @@
</define>
<define name="CT_FFName">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FldChar">
......@@ -12577,25 +12577,25 @@
<ref name="ST_OnOff"/>
</attribute>
<attribute name="dirty">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Hyperlink">
<ref name="EG_PContent"/>
<attribute name="tgtFrame">
<text/>
<data type="string"/>
</attribute>
<attribute name="tooltip">
<text/>
<data type="string"/>
</attribute>
<attribute name="docLocation">
<text/>
<data type="string"/>
</attribute>
<attribute name="history">
<ref name="ST_OnOff"/>
</attribute>
<attribute name="anchor">
<text/>
<data type="string"/>
</attribute>
<attribute name="r:id">
<ref name="ST_String"/>
......@@ -12643,7 +12643,7 @@
<ref name="ST_InfoTextType"/>
</attribute>
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FFStatusText">
......@@ -12651,7 +12651,7 @@
<ref name="ST_InfoTextType"/>
</attribute>
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FFCheckBox">
......@@ -12716,10 +12716,10 @@
</define>
<define name="CT_PaperSource">
<attribute name="first">
<text/>
<data type="string"/>
</attribute>
<attribute name="other">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_NumberFormat">
......@@ -13161,16 +13161,16 @@
</define>
<define name="AG_SectPrAttributes">
<attribute name="rsidRPr">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidDel">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidR">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidSect">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SectPrBase">
......@@ -13260,7 +13260,7 @@
</define>
<define name="CT_Sym">
<attribute name="font">
<text/>
<data type="string"/>
</attribute>
<attribute name="char">
<ref name="ST_ShortHexNumber"/>
......@@ -13268,36 +13268,36 @@
</define>
<define name="CT_ProofErr">
<attribute name="type">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Perm">
<attribute name="id">
<text/>
<data type="string"/>
</attribute>
<attribute name="displacedByCustomXml">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_PermStart">
<ref name="CT_Perm"/>
<attribute name="edGrp">
<text/>
<data type="string"/>
</attribute>
<attribute name="ed">
<text/>
<data type="string"/>
</attribute>
<attribute name="colFirst">
<text/>
<data type="string"/>
</attribute>
<attribute name="colLast">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Text">
<ref name="ST_String"/>
<attribute name="xml:space">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FtnEdnRefChar">
......@@ -13416,13 +13416,13 @@
<ref name="EG_RPr"/>
<ref name="EG_RunInnerContent"/>
<attribute name="rsidRPr">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidDel">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidR">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_Hint">
......@@ -13710,7 +13710,7 @@
</define>
<define name="CT_RubyAlign">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_RubyPr">
......@@ -13757,25 +13757,25 @@
</define>
<define name="CT_Lock">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SdtListItem">
<attribute name="displayText">
<text/>
<data type="string"/>
</attribute>
<attribute name="value">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SdtDateMappingType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_CalendarType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SdtDate">
......@@ -13792,7 +13792,7 @@
<ref name="CT_CalendarType"/>
</element>
<attribute name="fullDate">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SdtDocPart">
......@@ -13811,7 +13811,7 @@
<ref name="CT_SdtListItem"/>
</element>
<attribute name="lastValue">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Placeholder">
......@@ -13821,18 +13821,18 @@
</define>
<define name="CT_SdtText">
<attribute name="multiLine">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DataBinding">
<attribute name="prefixMappings">
<text/>
<data type="string"/>
</attribute>
<attribute name="xpath">
<text/>
<data type="string"/>
</attribute>
<attribute name="storeItemID">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SdtPr">
......@@ -14030,13 +14030,13 @@
</define>
<define name="CT_Attr">
<attribute name="uri">
<text/>
<data type="string"/>
</attribute>
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_CustomXmlRun">
......@@ -14045,10 +14045,10 @@
</element>
<ref name="EG_PContent"/>
<attribute name="uri">
<text/>
<data type="string"/>
</attribute>
<attribute name="element">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SmartTagRun">
......@@ -14057,10 +14057,10 @@
</element>
<ref name="EG_PContent"/>
<attribute name="uri">
<text/>
<data type="string"/>
</attribute>
<attribute name="element">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_CustomXmlBlock">
......@@ -14069,10 +14069,10 @@
</element>
<ref name="EG_ContentBlockContent"/>
<attribute name="uri">
<text/>
<data type="string"/>
</attribute>
<attribute name="element">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_CustomXmlPr">
......@@ -14089,10 +14089,10 @@
</element>
<ref name="EG_ContentRowContent"/>
<attribute name="uri">
<text/>
<data type="string"/>
</attribute>
<attribute name="element">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_CustomXmlCell">
......@@ -14101,10 +14101,10 @@
</element>
<ref name="EG_ContentCellContent"/>
<attribute name="uri">
<text/>
<data type="string"/>
</attribute>
<attribute name="element">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SmartTagPr">
......@@ -14132,19 +14132,19 @@
</element>
<ref name="EG_PContent"/>
<attribute name="rsidRPr">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidR">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidDel">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidP">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidRDefault">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_TblWidth">
......@@ -14161,10 +14161,10 @@
</define>
<define name="CT_Height">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
<attribute name="hRule">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_TblWidth">
......@@ -14428,16 +14428,16 @@
</element>
<ref name="EG_ContentCellContent"/>
<attribute name="rsidRPr">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidR">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidDel">
<text/>
<data type="string"/>
</attribute>
<attribute name="rsidTr">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_TblLayout">
......@@ -14480,19 +14480,19 @@
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
<attribute name="vertAnchor">
<text/>
<data type="string"/>
</attribute>
<attribute name="horzAnchor">
<text/>
<data type="string"/>
</attribute>
<attribute name="tblpXSpec">
<text/>
<data type="string"/>
</attribute>
<attribute name="tblpX">
<ref name="ST_SignedTwipsMeasure"/>
</attribute>
<attribute name="tblpYSpec">
<text/>
<data type="string"/>
</attribute>
<attribute name="tblpY">
<ref name="ST_SignedTwipsMeasure"/>
......@@ -14833,7 +14833,7 @@
</define>
<define name="CT_MailMergeSourceType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Odso">
......@@ -14914,7 +14914,7 @@
</define>
<define name="CT_TargetScreenSz">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Compat">
......@@ -15130,10 +15130,10 @@
</define>
<define name="CT_DocVar">
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DocVars">
......@@ -15151,7 +15151,7 @@
</define>
<define name="CT_CharacterSpacing">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_SaveThroughXslt">
......@@ -15159,7 +15159,7 @@
<ref name="ST_String"/>
</attribute>
<attribute name="solutionID">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_RPrDefault">
......@@ -15210,54 +15210,54 @@
</define>
<define name="CT_ColorSchemeMapping">
<attribute name="bg1">
<text/>
<data type="string"/>
</attribute>
<attribute name="t1">
<text/>
<data type="string"/>
</attribute>
<attribute name="bg2">
<text/>
<data type="string"/>
</attribute>
<attribute name="t2">
<text/>
<data type="string"/>
</attribute>
<attribute name="accent1">
<text/>
<data type="string"/>
</attribute>
<attribute name="accent2">
<text/>
<data type="string"/>
</attribute>
<attribute name="accent3">
<text/>
<data type="string"/>
</attribute>
<attribute name="accent4">
<text/>
<data type="string"/>
</attribute>
<attribute name="accent5">
<text/>
<data type="string"/>
</attribute>
<attribute name="accent6">
<text/>
<data type="string"/>
</attribute>
<attribute name="hyperlink">
<text/>
<data type="string"/>
</attribute>
<attribute name="followedHyperlink">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_ReadingModeInkLockDown">
<attribute name="actualPg">
<text/>
<data type="string"/>
</attribute>
<attribute name="w">
<text/>
<data type="string"/>
</attribute>
<attribute name="h">
<text/>
<data type="string"/>
</attribute>
<attribute name="fontSz">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_WriteProtection">
......@@ -15607,7 +15607,7 @@
</define>
<define name="CT_FrameScrollbar">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Frame">
......@@ -15638,7 +15638,7 @@
</define>
<define name="CT_FrameLayout">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FramesetSplitbar">
......@@ -15679,31 +15679,31 @@
<ref name="CT_Picture"/>
</element>
<attribute name="numPicBulletId">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_LevelSuffix">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_LevelText">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
<attribute name="null">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_LvlLegacy">
<attribute name="legacy">
<text/>
<data type="string"/>
</attribute>
<attribute name="legacySpace">
<text/>
<data type="string"/>
</attribute>
<attribute name="legacyIndent">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Lvl">
......@@ -15744,13 +15744,13 @@
<ref name="CT_RPr"/>
</element>
<attribute name="ilvl">
<text/>
<data type="string"/>
</attribute>
<attribute name="tplc">
<text/>
<data type="string"/>
</attribute>
<attribute name="tentative">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_MultiLevelType">
......@@ -15791,7 +15791,7 @@
<ref name="CT_Lvl"/>
</element>
<attribute name="abstractNumId">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_NumLvl">
......@@ -15802,7 +15802,7 @@
<ref name="CT_Lvl"/>
</element>
<attribute name="ilvl">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Num">
......@@ -15813,7 +15813,7 @@
<ref name="CT_NumLvl"/>
</element>
<attribute name="numId">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Numbering">
......@@ -15983,22 +15983,22 @@
</define>
<define name="CT_LsdException">
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
<attribute name="locked">
<text/>
<data type="string"/>
</attribute>
<attribute name="uiPriority">
<text/>
<data type="string"/>
</attribute>
<attribute name="semiHidden">
<text/>
<data type="string"/>
</attribute>
<attribute name="unhideWhenUsed">
<text/>
<data type="string"/>
</attribute>
<attribute name="qFormat">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_LatentStyles">
......@@ -16006,22 +16006,22 @@
<ref name="CT_LsdException"/>
</element>
<attribute name="defLockedState">
<text/>
<data type="string"/>
</attribute>
<attribute name="defUIPriority">
<text/>
<data type="string"/>
</attribute>
<attribute name="defSemiHidden">
<text/>
<data type="string"/>
</attribute>
<attribute name="defUnhideWhenUsed">
<text/>
<data type="string"/>
</attribute>
<attribute name="defQFormat">
<text/>
<data type="string"/>
</attribute>
<attribute name="count">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Styles">
......@@ -16102,10 +16102,10 @@
<define name="CT_FontRel">
<ref name="CT_Rel"/>
<attribute name="fontKey">
<text/>
<data type="string"/>
</attribute>
<attribute name="subsetted">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Font">
......@@ -16146,7 +16146,7 @@
<ref name="CT_FontRel"/>
</element>
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_FontsList">
......@@ -16202,7 +16202,7 @@
<ref name="CT_Divs"/>
</element>
<attribute name="id">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_Divs">
......@@ -16315,13 +16315,13 @@
</define>
<define name="CT_SmartTagType">
<attribute name="namespaceuri">
<text/>
<data type="string"/>
</attribute>
<attribute name="name">
<text/>
<data type="string"/>
</attribute>
<attribute name="url">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="ST_ThemeColor">
......@@ -16364,7 +16364,7 @@
</define>
<define name="CT_DocPartBehavior">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DocPartBehaviors">
......@@ -16374,7 +16374,7 @@
</define>
<define name="CT_DocPartType">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DocPartTypes">
......@@ -16382,12 +16382,12 @@
<ref name="CT_DocPartType"/>
</element>
<attribute name="all">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DocPartGallery">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DocPartCategory">
......@@ -16400,10 +16400,10 @@
</define>
<define name="CT_DocPartName">
<attribute name="val">
<text/>
<data type="string"/>
</attribute>
<attribute name="decorated">
<text/>
<data type="string"/>
</attribute>
</define>
<define name="CT_DocPartPr">
......@@ -16557,7 +16557,7 @@
<element>
<ref name="BUILT_IN_ANY_TYPE"/>
</element>
<text/>
<data type="string"/>
</choice>
</define>
</grammar>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment