summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-12-12 14:26:45 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-12-12 14:37:11 +0100
commit10c3c9ec9b6af1b4124ff2cd458d22f13f4ebc39 (patch)
tree674bc81b337bd01b0ceed8827c32a91b543d62fd
parent9790588da4b2de455ffc7a2cc69f26539823c3da (diff)
DocxExport::OutputDML: use the right namespace for groupshapes
Change-Id: Idd270e5519587440fe96e73f5cf51851f7680d59
-rw-r--r--sw/source/filter/ww8/docxexport.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 35383d4dddfd..6c7a66b608ca 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -331,7 +331,9 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, sal_In
void DocxExport::OutputDML(uno::Reference<drawing::XShape>& xShape)
{
- oox::drawingml::ShapeExport aExport(XML_wps, m_pDocumentFS, 0, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
+ uno::Reference<lang::XServiceInfo> xServiceInfo(xShape, uno::UNO_QUERY_THROW);
+ bool bGroupShape = xServiceInfo->supportsService("com.sun.star.drawing.GroupShape");
+ oox::drawingml::ShapeExport aExport((bGroupShape ? XML_wpg : XML_wps), m_pDocumentFS, 0, m_pFilter, oox::drawingml::DrawingML::DOCUMENT_DOCX, m_pAttrOutput);
aExport.WriteShape(xShape);
}