writerfilter/source/dmapper/GraphicImport.cxx | 1 writerfilter/source/ooxml/model.xml | 36 ++++++++++++++++++-------- 2 files changed, 27 insertions(+), 10 deletions(-)
New commits: commit 271011ff347790ae2b045cfd8035512cedeefb1b Author: Miklos Vajna <[email protected]> Date: Mon Jan 27 14:54:04 2014 +0100 writerfilter: recurse into NS_ooxml::LN_sizeRelH_sizeRelH Change-Id: I2fdb9ff8d5bcec194502a43207953103aa0b0dee diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 4fffad5..b76da13 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -822,6 +822,7 @@ void GraphicImport::lcl_sprm(Sprm & rSprm) case NS_ooxml::LN_c_chart: case NS_ooxml::LN_wps_wsp: case NS_ooxml::LN_wpg_wgp: + case NS_ooxml::LN_sizeRelH_sizeRelH: { 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 96b0958..e899a43 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -5229,7 +5229,7 @@ <element name="graphic" tokenid="ooxml:graphic_graphic"/> </resource> </namespace> - <namespace name="wp14" file="wp14.rng"> + <namespace name="wp14"> <start name="sizeRelH"/> <grammar xmlns="http://relaxng.org/ns/structure/1.0"; ns="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"; datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";> <define name="ST_SizeRelFromH"> commit c91820e9b524ec8158219fb86bd64dfb131ee05e Author: Miklos Vajna <[email protected]> Date: Mon Jan 27 14:37:22 2014 +0100 DOCX import: tokenize wp14:sizeRelH inside wp:inline Change-Id: Ie3dbb352f03b719fdf35ca17c36ad54cf9ef2f64 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index d6dd98a..96b0958 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -6449,6 +6449,11 @@ <element name="a:graphic"> <ref name="BUILT_IN_ANY_TYPE"/> </element> + <optional> + <element name="wp14:sizeRelH"> + <ref name="BUILT_IN_ANY_TYPE"/> + </element> + </optional> </group> <optional> <attribute name="distT"> @@ -6871,6 +6876,7 @@ <element name="docPr" tokenid="ooxml:CT_Inline_docPr"/> <element name="cNvGraphicFramePr" tokenid="ooxml:CT_Inline_cNvGraphicFramePr"/> <element name="a:graphic" tokenid="ooxml:CT_Inline_a_graphic"/> + <element name="wp14:sizeRelH" tokenid="ooxml:CT_Inline_wp14_sizeRelH"/> <attribute name="distT" tokenid="ooxml:CT_Inline_distT"/> <attribute name="distB" tokenid="ooxml:CT_Inline_distB"/> <attribute name="distL" tokenid="ooxml:CT_Inline_distL"/> commit 73917d71a8b2a87ae984a22ade7786977cbeb7cb Author: Miklos Vajna <[email protected]> Date: Mon Jan 27 14:36:12 2014 +0100 DOCX import: tokenize all ST_SizeRelFromH values Change-Id: Iee4ef243c6eca9a1ddced6bffc0ec22fb97213ab diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 9f15587..d6dd98a 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -5235,6 +5235,11 @@ <define name="ST_SizeRelFromH"> <choice> <value>margin</value> + <value>page</value> + <value>leftMargin</value> + <value>rightMargin</value> + <value>insideMargin</value> + <value>outsideMargin</value> </choice> </define> <define name="CT_SizeRelH"> @@ -5248,15 +5253,20 @@ </element> </define> </grammar> - <resource name="ST_SizeRelFromH" resource="List" generated="yes"> - <value name="margin" tokenid="ooxml:ST_SizeRelFromH_margin">margin</value> - </resource> - <resource name="CT_SizeRelH" resource="Properties" tag="shape"> - <attribute name="relativeFrom" tokenid="ooxml:CT_SizeRelH_relativeFrom"/> - </resource> - <resource name="sizeRelH" resource="Properties" tag="shape"> - <element name="sizeRelH" tokenid="ooxml:sizeRelH_sizeRelH"/> - </resource> + <resource name="ST_SizeRelFromH" resource="List" generated="yes"> + <value name="margin" tokenid="ooxml:ST_SizeRelFromH_margin">margin</value> + <value name="page" tokenid="ooxml:ST_SizeRelFromH_page">page</value> + <value name="leftMargin" tokenid="ooxml:ST_SizeRelFromH_leftMargin">leftMargin</value> + <value name="rightMargin" tokenid="ooxml:ST_SizeRelFromH_rightMargin">rightMargin</value> + <value name="insideMargin" tokenid="ooxml:ST_SizeRelFromH_insideMargin">insideMargin</value> + <value name="outsideMargin" tokenid="ooxml:ST_SizeRelFromH_outsideMargin">outsideMargin</value> + </resource> + <resource name="CT_SizeRelH" resource="Properties" tag="shape"> + <attribute name="relativeFrom" tokenid="ooxml:CT_SizeRelH_relativeFrom"/> + </resource> + <resource name="sizeRelH" resource="Properties" tag="shape"> + <element name="sizeRelH" tokenid="ooxml:sizeRelH_sizeRelH"/> + </resource> </namespace> <namespace name="dml-shapeGeometry" file="dml-shapeGeometry.rng" todo="ignore"> <grammar xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:fn="http://www.w3.org/2006/xpath-functions"; xmlns="http://relaxng.org/ns/structure/1.0"; ns="http://schemas.openxmlformats.org/drawingml/2006/main"; datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
