summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-06 09:39:49 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-06 10:16:28 +0100
commitc6d1ccd8024c9a90bf8f5732ce1e2b957e8048e7 (patch)
treef78e0681b1b0b999046fc22784df7bd0107ee915 /oox/source
parented738c515148c34d80474bba516e465c42a86b53 (diff)
oox: fix XML namespace of drawing::GraphicObjectShape in DML export
Change-Id: Ia7fb126f30ff1c4cd2f5fb8a5c71a87dd5e1d5c9
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/export/shapes.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 67cf3dc9706e..76dd7431ced0 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -272,8 +272,14 @@ ShapeExport& ShapeExport::WriteGroupShape(uno::Reference<drawing::XShape> xShape
{
uno::Reference<drawing::XShape> xChild(xGroupShape->getByIndex(i), uno::UNO_QUERY_THROW);
sal_Int32 nSavedNamespace = mnXmlNamespace;
- mnXmlNamespace = XML_wps;
+
+ uno::Reference<lang::XServiceInfo> xServiceInfo(xChild, uno::UNO_QUERY_THROW);
+ if (xServiceInfo->supportsService("com.sun.star.drawing.GraphicObjectShape"))
+ mnXmlNamespace = XML_pic;
+ else
+ mnXmlNamespace = XML_wps;
WriteShape(xChild);
+
mnXmlNamespace = nSavedNamespace;
}
m_xParent = xParent;