diff options
| author | Rosemary Sebastian <rosemary.seb8@gmail.com> | 2017-01-09 11:47:19 +0530 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-01-11 00:54:20 +0000 |
| commit | 28f50d7e387864bd41a67b2fb78b9c98a708a00e (patch) | |
| tree | 3510df543e5dfb65fc0fed0140d6021508436d05 /sw/source/filter/ww8/docxsdrexport.cxx | |
| parent | db4badfc971b9cc60809c3408f579bae04a77c34 (diff) | |
replace namespace url strings with function calls
Change-Id: I6e0c4c94ba7418ed9d7daa7f768baf703e22ab55
Reviewed-on: https://gerrit.libreoffice.org/32915
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sw/source/filter/ww8/docxsdrexport.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index b407082e494f..79e5d450a2c9 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -16,6 +16,7 @@ #include <editeng/charrotateitem.hxx> #include <svx/svdogrp.hxx> #include <oox/helper/propertyset.hxx> +#include <oox/token/namespaces.hxx> #include <oox/token/properties.hxx> #include <textboxhelper.hxx> #include <fmtanchr.hxx> @@ -835,7 +836,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFo else if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape")) pNamespace = "http://schemas.openxmlformats.org/drawingml/2006/picture"; pFS->startElementNS(XML_a, XML_graphic, - FSNS(XML_xmlns, XML_a), "http://schemas.openxmlformats.org/drawingml/2006/main", + FSNS(XML_xmlns, XML_a), OUStringToOString(m_pImpl->m_rExport.GetFilter().getNamespaceURL(OOX_NS(dml)), RTL_TEXTENCODING_UTF8).getStr(), FSEND); pFS->startElementNS(XML_a, XML_graphicData, XML_uri, pNamespace, @@ -844,7 +845,7 @@ void DocxSdrExport::writeDMLDrawing(const SdrObject* pSdrObject, const SwFrameFo bool bLockedCanvas = lcl_isLockedCanvas(xShape); if (bLockedCanvas) pFS->startElementNS(XML_lc, XML_lockedCanvas, - FSNS(XML_xmlns, XML_lc), "http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas", + FSNS(XML_xmlns, XML_lc), OUStringToOString(m_pImpl->m_rExport.GetFilter().getNamespaceURL(OOX_NS(dmlLockedCanvas)), RTL_TEXTENCODING_UTF8).getStr(), FSEND); m_pImpl->m_rExport.OutputDML(xShape); @@ -1168,7 +1169,7 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat FSEND); pFS->startElementNS(XML_a, XML_graphic, - FSNS(XML_xmlns, XML_a), "http://schemas.openxmlformats.org/drawingml/2006/main", + FSNS(XML_xmlns, XML_a), OUStringToOString(m_pImpl->m_rExport.GetFilter().getNamespaceURL(OOX_NS(dml)), RTL_TEXTENCODING_UTF8).getStr(), FSEND); pFS->startElementNS(XML_a, XML_graphicData, @@ -1228,8 +1229,8 @@ void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const SwFrameFormat } pFS->singleElementNS(XML_dgm, XML_relIds, - FSNS(XML_xmlns, XML_dgm), "http://schemas.openxmlformats.org/drawingml/2006/diagram", - FSNS(XML_xmlns, XML_r), "http://schemas.openxmlformats.org/officeDocument/2006/relationships", + FSNS(XML_xmlns, XML_dgm), OUStringToOString(m_pImpl->m_rExport.GetFilter().getNamespaceURL(OOX_NS(dmlDiagram)), RTL_TEXTENCODING_UTF8).getStr(), + FSNS(XML_xmlns, XML_r), OUStringToOString(m_pImpl->m_rExport.GetFilter().getNamespaceURL(OOX_NS(officeRel)), RTL_TEXTENCODING_UTF8).getStr(), FSNS(XML_r, XML_dm), dataRelId.getStr(), FSNS(XML_r, XML_lo), layoutRelId.getStr(), FSNS(XML_r, XML_qs), styleRelId.getStr(), @@ -1406,7 +1407,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b pFS->singleElementNS(XML_wp, XML_docPr, xDocPrAttrListRef); pFS->startElementNS(XML_a, XML_graphic, - FSNS(XML_xmlns, XML_a), "http://schemas.openxmlformats.org/drawingml/2006/main", + FSNS(XML_xmlns, XML_a), OUStringToOString(m_pImpl->m_rExport.GetFilter().getNamespaceURL(OOX_NS(dml)), RTL_TEXTENCODING_UTF8).getStr(), FSEND); pFS->startElementNS(XML_a, XML_graphicData, XML_uri, "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", |