summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-12-17 16:08:29 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-12-17 16:30:04 +0100
commit1279f9c835d188be72a21779377cb03841d6bc54 (patch)
tree22a64122c942523a6039599111fdcd78584cbc4d /oox
parent236c0762c14cace93deae4175073519ef67e4b48 (diff)
DOCX drawingml export: give drawinglayer pictures the correct namespace
This is triggered by testVMLData in CppunitTest_sw_ooxmlexport when DML export is enabled in non-experimental mode. Change-Id: Id636b1ab701ff49da1b05b720fcb2173360584ba
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/shapes.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 6a793b741b49..b2b39a4a84f8 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -446,7 +446,12 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, const
FSHelperPtr pFS = GetFS();
- pFS->startElementNS( mnXmlNamespace, XML_pic, FSEND );
+ if (GetDocumentType() != DOCUMENT_DOCX)
+ pFS->startElementNS( mnXmlNamespace, XML_pic, FSEND );
+ else
+ pFS->startElementNS( mnXmlNamespace, XML_pic,
+ FSNS(XML_xmlns, XML_pic), "http://schemas.openxmlformats.org/drawingml/2006/picture",
+ FSEND );
pFS->startElementNS( mnXmlNamespace, XML_nvPicPr, FSEND );