diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-03-05 20:14:49 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-03-05 20:24:02 +0100 |
| commit | e9c6b925957bcc47337c81db5b32b16dcf38e612 (patch) | |
| tree | 2f9138fb81f65ececf25cccd37f1d1ba0f7ce32b | |
| parent | dd02b6021ed74d9ec6605fed53f30c52ec067687 (diff) | |
writerfilter: add anchorId also for CT_Inline in model.xml
Change-Id: Ie491345697e584597867df3937c8d832d0609a70
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index bb63221fdb5c..8739717b5566 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -7887,6 +7887,11 @@ <xs:documentation>Distance from Text</xs:documentation> </data> </define> + <define name="ST_EditId"> + <data type="hexBinary"> + <param name="length">4</param> + </data> + </define> <define name="CT_Inline"> <group> <element name="extent"> @@ -7943,6 +7948,11 @@ <xs:documentation>Distance From Text on Right Edge</xs:documentation> </attribute> </optional> + <optional> + <attribute name="wp14:anchorId"> + <ref name="ST_EditId"/> + </attribute> + </optional> </define> <define name="ST_WrapText"> <list> @@ -8196,11 +8206,6 @@ </choice> </list> </define> - <define name="ST_EditId"> - <data type="hexBinary"> - <param name="length">4</param> - </data> - </define> <define name="CT_PosV"> <choice> <element name="align"> @@ -8325,9 +8330,11 @@ </data> <xs:documentation>Allow Objects to Overlap</xs:documentation> </attribute> - <attribute name="wp14:anchorId"> - <ref name="ST_EditId"/> - </attribute> + <optional> + <attribute name="wp14:anchorId"> + <ref name="ST_EditId"/> + </attribute> + </optional> </define> <define name="inline"> <element name="inline"> @@ -8347,7 +8354,7 @@ <attribute name="b" tokenid="ooxml:CT_EffectExtent_b"/> </resource> <resource name="ST_WrapDistance" resource="Integer" generated="yes"/> - <resource xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="CT_Inline" resource="Properties" tag="shape"> + <resource xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" name="CT_Inline" resource="Properties" tag="shape"> <element name="extent" tokenid="ooxml:CT_Inline_extent"/> <element name="effectExtent" tokenid="ooxml:CT_Inline_effectExtent"/> <element name="docPr" tokenid="ooxml:CT_Inline_docPr"/> @@ -8359,6 +8366,7 @@ <attribute name="distB" tokenid="ooxml:CT_Inline_distB"/> <attribute name="distL" tokenid="ooxml:CT_Inline_distL"/> <attribute name="distR" tokenid="ooxml:CT_Inline_distR"/> + <attribute name="wp14:anchorId" tokenid="ooxml:CT_Inline_wp14_anchorId"/> </resource> <resource name="ST_WrapText" resource="List" generated="yes"> <value name="bothSides" tokenid="ooxml:Value_wordprocessingDrawing_ST_WrapText_bothSides">bothSides</value> |