summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-06-19 17:41:34 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-06-20 10:46:56 +0200
commit363dafefad14411a16f6ea9d2ee0d55b67bc9c8d (patch)
treea946539553b404916df45a5a808204f900ec2ce9
parent32b93c5c4f0663eefd1e1979875f8af659c463df (diff)
fdo#43641 writerfilter: tokenize lc:lockedCanvas
These are just the minimal changes, so that writerfilter calls into oox::shape::ShapeContextHandler, which does the real work. Change-Id: Ia53731ac8592964b70e8a438ed09262463c05360
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx1
-rw-r--r--writerfilter/source/ooxml/model.xml23
2 files changed, 24 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 8403f72187a1..a6c62955675d 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -1205,6 +1205,7 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
case NS_ooxml::LN_graphic_graphic:
case NS_ooxml::LN_pic_pic:
case NS_ooxml::LN_dgm_relIds:
+ case NS_ooxml::LN_lc_lockedCanvas:
{
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 cdafa91e89bf..c9f2d4f962ed 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -26,6 +26,7 @@
<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="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="lockedCanvas" id="dmlLockedCanvas"/>
<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"/>
@@ -5165,6 +5166,7 @@
<zeroOrMore>
<ref name="pic"/>
<ref name="relIds"/>
+ <ref name="lockedCanvas"/>
<element>
<anyName/>
<ref name="BUILT_IN_ANY_TYPE"/>
@@ -5191,6 +5193,7 @@
<resource name="CT_GraphicalObjectData" resource="Properties" tag="shape">
<element name="pic" tokenid="ooxml:CT_GraphicalObjectData_pic"/>
<element name="relIds" tokenid="ooxml:CT_GraphicalObjectData_relIds"/>
+ <element name="lockedCanvas" tokenid="ooxml:CT_GraphicalObjectData_lockedCanvas"/>
<attribute name="uri" tokenid="ooxml:CT_GraphicalObjectData_uri"/>
</resource>
<resource name="CT_GraphicalObject" resource="Properties" tag="shape">
@@ -8454,6 +8457,19 @@
<ref name="CT_RelIds"/>
</element>
</define>
+ <define xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" name="CT_GvmlGroupShape">
+ <element name="nvGrpSpPr">
+ <ref name="CT_NonVisualGroupDrawingShapeProps"/>
+ </element>
+ <element name="grpSpPr">
+ <ref name="CT_GroupShapeProperties"/>
+ </element>
+ </define>
+ <define name="lockedCanvas">
+ <element xmlns:lc="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" name="lc:lockedCanvas">
+ <ref name="CT_GvmlGroupShape"/>
+ </element>
+ </define>
</grammar>
<resource name="CT_PictureNonVisual" resource="Properties" tag="shape">
<element name="cNvPr" tokenid="ooxml:CT_PictureNonVisual_cNvPr"/>
@@ -8476,6 +8492,13 @@
<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>
+ <resource xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="CT_GvmlGroupShape" resource="Shape" tag="shape">
+ <element name="a:nvGrpSpPr" tokenid="ooxml:CT_GvmlGroupShape_nvGrpSpPr"/>
+ <element name="a:grpSpPr" tokenid="ooxml:CT_GvmlGroupShape_grpSpPr"/>
+ </resource>
+ <resource name="lockedCanvas" resource="Shape" tag="shape">
+ <element xmlns:lc="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" name="lc:lockedCanvas" tokenid="ooxml:lc_lockedCanvas"/>
+ </resource>
</namespace>
<namespace name="vml-main" file="vml-main.rng" todo="ignore">
<start name="shape"/>