diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-17 15:30:33 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-17 15:53:27 +0200 |
commit | 54ac480baf09987b85d7bcde5191e36739e06af7 (patch) | |
tree | edd9da5e2c6a8765f1a8cc3c121ef0213c741d0e /writerfilter | |
parent | 1120312c83c2350f9428de3f11072adae56f9e3f (diff) |
Sync oox -> writerfilter alias for remaining namespaces
Change-Id: I47bb934102dd18695b3e4647c0f6216ee98f059c
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 14 | ||||
-rw-r--r-- | writerfilter/source/ooxml/model.xml | 34 |
2 files changed, 24 insertions, 24 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 158c6141f474..c982d547a536 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -256,9 +256,9 @@ void OOXMLFastContextHandler::lcl_startFastElement throw (uno::RuntimeException, xml::sax::SAXException) { OOXMLFactory::getInstance()->startAction(this, Element); - if( Element == (NMSP_wordprocessingDrawing|XML_positionV) ) + if( Element == (NMSP_dmlWordDr|XML_positionV) ) inPositionV = true; - else if( Element == (NMSP_wordprocessingDrawing|XML_positionH) ) + else if( Element == (NMSP_dmlWordDr|XML_positionH) ) inPositionV = false; } @@ -1748,7 +1748,7 @@ void OOXMLFastContextHandlerShape::sendShape( Token_t Element ) newProperty(NS_ooxml::LN_shape, pValue); m_bShapeSent = true; - bool bIsPicture = Element == ( NMSP_picture | XML_pic ); + bool bIsPicture = Element == ( NMSP_dmlPicture | XML_pic ); // Notify the dmapper that the shape is ready to use if ( !bIsPicture ) @@ -1773,7 +1773,7 @@ void OOXMLFastContextHandlerShape::lcl_endFastElement OOXMLFastContextHandlerProperties::lcl_endFastElement(Element); // Ending the shape should be the last thing to do - bool bIsPicture = Element == ( NMSP_picture | XML_pic ); + bool bIsPicture = Element == ( NMSP_dmlPicture | XML_pic ); if ( !bIsPicture && m_bShapeStarted) mpStream->endShape( ); } @@ -1803,7 +1803,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext switch (nNamespace) { case NMSP_doc: - case NMSP_vml_wordprocessingDrawing: + case NMSP_vmlWord: case NMSP_vmlOffice: if (!bGroupShape) xContextHandler.set(OOXMLFactory::getInstance()->createFastChildContextFromStart(this, Element)); @@ -1822,7 +1822,7 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext if (!bGroupShape) { pWrapper->addNamespace(NMSP_doc); - pWrapper->addNamespace(NMSP_vml_wordprocessingDrawing); + pWrapper->addNamespace(NMSP_vmlWord); pWrapper->addNamespace(NMSP_vmlOffice); pWrapper->addToken( NMSP_vml|XML_textbox ); } @@ -1989,7 +1989,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext // processed by writerfilter (instead of oox), but we have no method to // filter out a single token. Just hardwire the wrap token here till we // need a more generic solution. - bool bIsWrap = Element == static_cast<sal_Int32>(NMSP_vml_wordprocessingDrawing | XML_wrap); + bool bIsWrap = Element == static_cast<sal_Int32>(NMSP_vmlWord | XML_wrap); if ( bInNamespaces && ((pShapeCtx->isShapeSent() && bIsWrap) || !bIsWrap) ) xResult.set(OOXMLFactory::getInstance()->createFastChildContextFromStart(this, Element)); else if (mxContext.is()) diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 35fb03e9d6e0..964a1fa374fa 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -21,28 +21,28 @@ <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="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"/> - <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/main" alias="drawingml"/> - <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/main" alias="drawingml"/> + <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" alias="officeRelTheme"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" alias="dmlWordDr"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/wordprocessingDrawing" alias="dmlWordDr"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/main" alias="dml"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/main" alias="dml"/> <namespace-alias name="urn:schemas-microsoft-com:vml" alias="vml"/> - <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="picture"/> - <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/picture" alias="picture"/> - <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="diagram"/> - <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/diagram" alias="diagram"/> - <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="lockedCanvas"/> - <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/lockedCanvas" alias="lockedCanvas"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/picture" alias="dmlPicture"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/picture" alias="dmlPicture"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/diagram" alias="dmlDiagram"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/diagram" alias="dmlDiagram"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas" alias="dmlLockedCanvas"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/lockedCanvas" alias="dmlLockedCanvas"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" alias="wps"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" alias="wpg"/> - <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/chart" alias="chart"/> - <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/chart" alias="chart"/> - <namespace-alias name="urn:schemas-microsoft-com:office:word" alias="vml_wordprocessingDrawing"/> + <namespace-alias name="http://schemas.openxmlformats.org/drawingml/2006/chart" alias="dmlChart"/> + <namespace-alias name="http://purl.oclc.org/ooxml/drawingml/chart" alias="dmlChart"/> + <namespace-alias name="urn:schemas-microsoft-com:office:word" alias="vmlWord"/> <namespace-alias name="http://schemas.openxmlformats.org/wordprocessingml/2006/main" alias="doc"/> <namespace-alias name="http://purl.oclc.org/ooxml/wordprocessingml/main" alias="doc"/> - <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/math" alias="math"/> - <namespace-alias name="http://purl.oclc.org/ooxml/officeDocument/math" alias="math"/> - <namespace-alias name="http://schemas.openxmlformats.org/schemaLibrary/2006/main" alias="schemaLibrary"/> + <namespace-alias name="http://schemas.openxmlformats.org/officeDocument/2006/math" alias="officeMath"/> + <namespace-alias name="http://purl.oclc.org/ooxml/officeDocument/math" alias="officeMath"/> + <namespace-alias name="http://schemas.openxmlformats.org/schemaLibrary/2006/main" alias="schema"/> <namespace-alias name="http://schemas.openxmlformats.org/markup-compatibility/2006" alias="mce"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" alias="wp14"/> <namespace-alias name="http://schemas.microsoft.com/office/word/2010/wordml" alias="w14"/> |