diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-12 11:48:29 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-12 12:09:02 +0100 |
| commit | 1957303363ea9bd308b5781da09beaa09df7420c (patch) | |
| tree | ea2e91f0a2158e84b28dbbde147803266f9661b1 | |
| parent | ae6b44c32582d40cd63e7b475cb76047aea49e65 (diff) | |
DOCX: when writing a group shape, require wpg
Change-Id: I046c778cd998582446e96ac1e55f3e2da1e61081
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b30604d42c04..f4aefbba5880 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -76,6 +76,7 @@ #include <editeng/editobj.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> +#include <svx/svdogrp.hxx> #include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> #include <svl/grabbagitem.hxx> @@ -3433,8 +3434,9 @@ void DocxAttributeOutput::WriteDMLDrawing( const SdrObject* pSdrObject, const Sw m_pSerializer->startElementNS( XML_a, XML_graphic, FSNS( XML_xmlns, XML_a ), "http://schemas.openxmlformats.org/drawingml/2006/main", FSEND ); + const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, pSdrObject); m_pSerializer->startElementNS( XML_a, XML_graphicData, - XML_uri, "http://schemas.microsoft.com/office/word/2010/wordprocessingShape", + XML_uri, (pObjGroup ? "http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" : "http://schemas.microsoft.com/office/word/2010/wordprocessingShape"), FSEND ); uno::Reference<drawing::XShape> xShape(const_cast<SdrObject*>(pSdrObject)->getUnoShape(), uno::UNO_QUERY_THROW); @@ -3450,8 +3452,9 @@ void DocxAttributeOutput::WriteDMLAndVMLDrawing(const SdrObject* sdrObj, const S { m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, FSEND); + const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj); m_pSerializer->startElementNS(XML_mc, XML_Choice, - XML_Requires, "wps", + XML_Requires, (pObjGroup ? "wpg" : "wps"), FSEND); WriteDMLDrawing(sdrObj, &rFrmFmt); m_pSerializer->endElementNS(XML_mc, XML_Choice); |