diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-16 18:44:37 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-16 18:56:35 +0200 |
commit | e33f6f499f9eca9a558cec557b20557f714f1caf (patch) | |
tree | 21635526a46d689a2c395d1a79b15ae7cf375b76 /writerfilter | |
parent | 28bf20625cfcd3b3e4492e873471e26ded880080 (diff) |
Sync oox -> writerfilter alias for generic VML
See 656ab07b2924dd2703f31f460c8586c375c7878a (Sync oox -> writerfilter
alias for wordprocessingml, 2014-08-10).
Change-Id: I5179961b683473a502693923422171bb274fc845
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/ooxml/model.xml | 48 |
2 files changed, 26 insertions, 26 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 3a0964187f0d..158c6141f474 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1804,7 +1804,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext { case NMSP_doc: case NMSP_vml_wordprocessingDrawing: - case NMSP_office: + case NMSP_vmlOffice: if (!bGroupShape) xContextHandler.set(OOXMLFactory::getInstance()->createFastChildContextFromStart(this, Element)); // no break; @@ -1823,7 +1823,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext { pWrapper->addNamespace(NMSP_doc); pWrapper->addNamespace(NMSP_vml_wordprocessingDrawing); - pWrapper->addNamespace(NMSP_office); + pWrapper->addNamespace(NMSP_vmlOffice); pWrapper->addToken( NMSP_vml|XML_textbox ); } diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index ccabb1bcd728..35fb03e9d6e0 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -20,7 +20,7 @@ <namespace-alias name="http://www.w3.org/XML/1998/namespace" alias="xml"/> <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships" alias="officeRel"/> <namespace-alias name="http://purl.oclc.org/ooxml/officeDocument/relationships" alias="officeRel"/> - <namespace-alias name="urn:schemas-microsoft-com:office:office" alias="office"/> + <namespace-alias name="urn:schemas-microsoft-com:office:office" alias="vmlOffice"/> <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" alias="theme"/> <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" alias="wordprocessingDrawing"/> <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing" alias="wordprocessingDrawing"/> @@ -10431,35 +10431,35 @@ <action name="end" action="handleOLE"/> </resource> <resource name="ST_Angle" resource="List"> - <value tokenid="ooxml:Value_office_ST_Angle_any">any</value> - <value tokenid="ooxml:Value_office_ST_Angle_30">30</value> - <value tokenid="ooxml:Value_office_ST_Angle_45">45</value> - <value tokenid="ooxml:Value_office_ST_Angle_60">60</value> - <value tokenid="ooxml:Value_office_ST_Angle_90">90</value> - <value tokenid="ooxml:Value_office_ST_Angle_auto">auto</value> + <value tokenid="ooxml:Value_vmlOffice_ST_Angle_any">any</value> + <value tokenid="ooxml:Value_vmlOffice_ST_Angle_30">30</value> + <value tokenid="ooxml:Value_vmlOffice_ST_Angle_45">45</value> + <value tokenid="ooxml:Value_vmlOffice_ST_Angle_60">60</value> + <value tokenid="ooxml:Value_vmlOffice_ST_Angle_90">90</value> + <value tokenid="ooxml:Value_vmlOffice_ST_Angle_auto">auto</value> </resource> <resource name="ST_OLELinkType" resource="List"> - <value tokenid="ooxml:Value_office_ST_OLELinkType_Picture">Picture</value> - <value tokenid="ooxml:Value_office_ST_OLELinkType_Bitmap">Bitmap</value> - <value tokenid="ooxml:Value_office_ST_OLELinkType_EnhancedMetaFile">EnhancedMetaFile</value> + <value tokenid="ooxml:Value_vmlOffice_ST_OLELinkType_Picture">Picture</value> + <value tokenid="ooxml:Value_vmlOffice_ST_OLELinkType_Bitmap">Bitmap</value> + <value tokenid="ooxml:Value_vmlOffice_ST_OLELinkType_EnhancedMetaFile">EnhancedMetaFile</value> </resource> <resource name="ST_TrueFalseBlank" resource="List"> - <value tokenid="ooxml:Value_office_ST_TrueFalseBlank_"/> - <value tokenid="ooxml:Value_office_ST_TrueFalseBlank_t">t</value> - <value tokenid="ooxml:Value_office_ST_TrueFalseBlank_f">f</value> - <value tokenid="ooxml:Value_office_ST_TrueFalseBlank_true">true</value> - <value tokenid="ooxml:Value_office_ST_TrueFalseBlank_false">false</value> + <value tokenid="ooxml:Value_vmlOffice_ST_TrueFalseBlank_"/> + <value tokenid="ooxml:Value_vmlOffice_ST_TrueFalseBlank_t">t</value> + <value tokenid="ooxml:Value_vmlOffice_ST_TrueFalseBlank_f">f</value> + <value tokenid="ooxml:Value_vmlOffice_ST_TrueFalseBlank_true">true</value> + <value tokenid="ooxml:Value_vmlOffice_ST_TrueFalseBlank_false">false</value> </resource> <resource name="ST_FillType" resource="List"> - <value tokenid="ooxml:Value_office_ST_FillType_gradientCenter">gradientCenter</value> - <value tokenid="ooxml:Value_office_ST_FillType_solid">solid</value> - <value tokenid="ooxml:Value_office_ST_FillType_pattern">pattern</value> - <value tokenid="ooxml:Value_office_ST_FillType_tile">tile</value> - <value tokenid="ooxml:Value_office_ST_FillType_frame">frame</value> - <value tokenid="ooxml:Value_office_ST_FillType_gradientUnscaled">gradientUnscaled</value> - <value tokenid="ooxml:Value_office_ST_FillType_gradientRadial">gradientRadial</value> - <value tokenid="ooxml:Value_office_ST_FillType_gradient">gradient</value> - <value tokenid="ooxml:Value_office_ST_FillType_background">background</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_gradientCenter">gradientCenter</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_solid">solid</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_pattern">pattern</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_tile">tile</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_frame">frame</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_gradientUnscaled">gradientUnscaled</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_gradientRadial">gradientRadial</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_gradient">gradient</value> + <value tokenid="ooxml:Value_vmlOffice_ST_FillType_background">background</value> </resource> </namespace> <namespace name="mce"> |