diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-03-05 18:44:52 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-03-05 20:24:00 +0100 |
| commit | 7452e530c01193de2dedf54b2f91e797f341f19e (patch) | |
| tree | e9625b94fc98aabe5e1a89ebdc022e2f0f5e0e50 | |
| parent | ca6e60d4c014e7471acc7a7601148fe751634f27 (diff) | |
oox & writerfilter: add "anchorId" token and update model.xml
Change-Id: Ibcbf552621b8c6c5c143521a697026cdeac90706
| -rw-r--r-- | oox/source/token/tokens.txt | 1 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt index ff5466c247a2..84f28c18a39e 100644 --- a/oox/source/token/tokens.txt +++ b/oox/source/token/tokens.txt @@ -563,6 +563,7 @@ alwaysShowPlaceholderText amt anchor anchorCtr +anchorId anchorLock anchorlock anchorx diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index f10bb0076662..bb63221fdb5c 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -8196,7 +8196,7 @@ </choice> </list> </define> - <define name="ST_LongHexNumber"> + <define name="ST_EditId"> <data type="hexBinary"> <param name="length">4</param> </data> @@ -8326,7 +8326,7 @@ <xs:documentation>Allow Objects to Overlap</xs:documentation> </attribute> <attribute name="wp14:anchorId"> - <ref name="ST_LongHexNumber"/> + <ref name="ST_EditId"/> </attribute> </define> <define name="inline"> @@ -8443,7 +8443,7 @@ <element name="posOffset" tokenid="ooxml:CT_PosV_posOffset"/> <attribute name="relativeFrom" tokenid="ooxml:CT_PosV_relativeFrom"/> </resource> - <resource name="ST_LongHexNumber" resource="Hex"/> + <resource name="ST_EditId" resource="Hex"/> <resource xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" name="CT_Anchor" resource="Properties" tag="shape"> <element name="simplePos" tokenid="ooxml:CT_Anchor_simplePos_elem"/> <element name="positionH" tokenid="ooxml:CT_Anchor_positionH"/> |