diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-05-29 08:36:29 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-05-29 09:11:51 +0200 |
commit | 028d56943cac2a6f5eeec5f9f675e20814cb7447 (patch) | |
tree | ab9513a206cdc589bd8168ad307f693e01e0437d /writerfilter | |
parent | b6ce391171e417199d33ae085d2f0768a3e952b3 (diff) |
writerfilter: read dgm:relIds element and its attributes
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 1 | ||||
-rw-r--r-- | writerfilter/source/ooxml/model.xml | 31 |
2 files changed, 32 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 4a71e1cc590f..5429bbc9f1f9 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1165,6 +1165,7 @@ void GraphicImport::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_CT_WrapPath_lineTo: // 90925; case NS_ooxml::LN_graphic_graphic: case NS_ooxml::LN_pic_pic: + case NS_ooxml::LN_dgm_relIds: { writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); if( pProperties.get()) diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index c5fea31ea259..dbaa151406c7 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -8,6 +8,7 @@ <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/main" alias="drawingml" id="dml"/> <namespace-alias name="urn:schemas-microsoft-com:vml" alias="vml" id="vml"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="picture" id="dmlPicture"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="diagram" id="dmlDiagram"/> <namespace-alias name="urn:schemas-microsoft-com:office:word" alias="vml_wordprocessingDrawing" id="vmlWord"/> <namespace-alias name="http://schemas.openxmlformats.org/wordprocessingml/2006/main" alias="wordprocessingml" id="doc"/> <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/math" alias="math" id="officeMath"/> @@ -5146,6 +5147,7 @@ <define name="CT_GraphicalObjectData"> <zeroOrMore> <ref name="pic"/> + <ref name="relIds"/> <element> <anyName/> <ref name="BUILT_IN_ANY_TYPE"/> @@ -5171,6 +5173,7 @@ </grammar> <resource name="CT_GraphicalObjectData" resource="Properties" tag="shape"> <element name="pic" tokenid="ooxml:CT_GraphicalObjectData_pic"/> + <element name="relIds" tokenid="ooxml:CT_GraphicalObjectData_relIds"/> <attribute name="uri" tokenid="ooxml:CT_GraphicalObjectData_uri"/> </resource> <resource name="CT_GraphicalObject" resource="Properties" tag="shape"> @@ -8415,6 +8418,25 @@ <ref name="CT_Picture"/> </element> </define> + <define xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" name="CT_RelIds"> + <attribute name="r:dm"> + <text/> + </attribute> + <attribute name="r:lo"> + <text/> + </attribute> + <attribute name="r:qs"> + <text/> + </attribute> + <attribute name="r:cs"> + <text/> + </attribute> + </define> + <define name="relIds"> + <element xmlns:dgm="http://schemas.openxmlformats.org/drawingml/2006/diagram" name="dgm:relIds"> + <ref name="CT_RelIds"/> + </element> + </define> </grammar> <resource name="CT_PictureNonVisual" resource="Properties" tag="shape"> <element name="cNvPr" tokenid="ooxml:CT_PictureNonVisual_cNvPr"/> @@ -8428,6 +8450,15 @@ <resource name="pic" resource="Properties" tag="shape"> <element name="pic" tokenid="ooxml:pic_pic"/> </resource> + <resource xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" name="CT_RelIds" resource="Shape" tag="shape"> + <attribute name="r:dm" tokenid="ooxml:CT_RelIds_dm"/> + <attribute name="r:lo" tokenid="ooxml:CT_RelIds_lo"/> + <attribute name="r:qs" tokenid="ooxml:CT_RelIds_qs"/> + <attribute name="r:cs" tokenid="ooxml:CT_RelIds_cs"/> + </resource> + <resource name="relIds" resource="Shape" tag="shape"> + <element xmlns:dgm="http://schemas.openxmlformats.org/drawingml/2006/diagram" name="dgm:relIds" tokenid="ooxml:dgm_relIds"/> + </resource> </namespace> <namespace name="vml-main" file="vml-main.rng" todo="ignore"> <start name="shape"/> |