mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

writerfilter: tokenize wps:wsp

Browse Source 
These are just the minimal changes, so that writerfilter calls into
oox::shape::ShapeContextHandler, which does the real work.

Change-Id: I4f44a508736d780ff090bca0d12526160ddd167f
This commit is contained in:
Miklos Vajna
2013-11-13 10:33:39 +01:00
parent 1d4db60ab3
commit cd29a30fcf
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
writerfilter/source/dmapper/GraphicImport.cxx
View File

@@ -1209,6 +1209,7 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
case NS_ooxml::LN_dgm_relIds:
case NS_ooxml::LN_lc_lockedCanvas:
case NS_ooxml::LN_c_chart:
case NS_ooxml::LN_wps_wsp:
{
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if( pProperties.get())

23
writerfilter/source/ooxml/model.xml
View File

@@ -27,6 +27,7 @@
<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="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" alias="wps" id="wps"/>
<namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/chart" alias="chart" id="dmlChart"/>
<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"/>
@@ -5171,6 +5172,7 @@
<ref name="relIds"/>
<ref name="lockedCanvas"/>
<ref name="chart"/>
<ref name="wsp"/>
<element>
<anyName/>
<ref name="BUILT_IN_ANY_TYPE"/>
@@ -5199,6 +5201,7 @@
<element name="relIds" tokenid="ooxml:CT_GraphicalObjectData_relIds"/>
<element name="lockedCanvas" tokenid="ooxml:CT_GraphicalObjectData_lockedCanvas"/>
<element name="chart" tokenid="ooxml:CT_GraphicalObjectData_chart"/>
<element name="wsp" tokenid="ooxml:CT_GraphicalObjectData_wsp"/>
<attribute name="uri" tokenid="ooxml:CT_GraphicalObjectData_uri"/>
</resource>
<resource name="CT_GraphicalObject" resource="Properties" tag="shape">
@@ -8485,6 +8488,19 @@
<ref name="CT_Chart"/>
</element>
</define>
<define name="CT_WordprocessingShape">
<element name="cNvSpPr">
<ref name="CT_NonVisualDrawingShapeProps"/>
</element>
<element name="spPr">
<ref name="CT_ShapeProperties"/>
</element>
</define>
<define name="wsp">
<element xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" name="wps:wsp">
<ref name="CT_WordprocessingShape"/>
</element>
</define>
</grammar>
<resource name="CT_PictureNonVisual" resource="Properties" tag="shape">
<element name="cNvPr" tokenid="ooxml:CT_PictureNonVisual_cNvPr"/>
@@ -8520,6 +8536,13 @@
<resource name="chart" resource="Shape" tag="shape">
<element xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" name="c:chart" tokenid="ooxml:c_chart"/>
</resource>
<resource xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" name="CT_WordprocessingShape" resource="Shape" tag="shape">
<element name="wps:cNvSpPr" tokenid="ooxml:CT_WordprocessingShape_cNvSpPr"/>
<element name="wps:spPr" tokenid="ooxml:CT_WordprocessingShape_spPr"/>
</resource>
<resource name="wsp" resource="Shape" tag="shape">
<element xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" name="wps:wsp" tokenid="ooxml:wps_wsp"/>
</resource>
</namespace>
<namespace name="vml-main" file="vml-main.rng" todo="ignore">