diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-17 11:31:07 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-17 11:53:43 +0100 |
| commit | 64dc8acbf13eff6d52056a9464bba550651dce95 (patch) | |
| tree | 5fcfcb3df8467d717e9e4538453e73f19bf670f5 /sw | |
| parent | 944a086d9223a84e1ae8d7839433fccaff361b79 (diff) | |
DocxSdrExport: there is no DML syntax for watermarks
At least what we wrote previously is not accepted by Word and even Word
2013 writes watermarks as VML-only.
This fixes testWatermark in CppunitTest_sw_ooxmlexport when DML export is
enabled in non-experimental mode.
Change-Id: I231014dd7ad60b5a4b0d79e76cdc3386641af032
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 57affcf91cde..8b6a2bdd0f01 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -351,20 +351,31 @@ void DocxSdrExport::Impl::writeDMLDrawing(const SdrObject* pSdrObject, const SwF void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* sdrObj, const SwFrmFmt& rFrmFmt,const Point& rNdTopLeft, int nAnchorId) { - m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, FSEND); + // Depending on the shape type, we actually don't write the shape as DML. + OUString sShapeType; + sal_uInt32 nMirrorFlags = 0; + uno::Reference<drawing::XShape> xShape(const_cast<SdrObject*>(sdrObj)->getUnoShape(), uno::UNO_QUERY_THROW); + MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType(xShape, nMirrorFlags, sShapeType); - const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj); - m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Choice, - XML_Requires, (pObjGroup ? "wpg" : "wps"), - FSEND); - m_pImpl->writeDMLDrawing(sdrObj, &rFrmFmt, nAnchorId); - m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Choice); + if (eShapeType != ESCHER_ShpInst_TextPlainText) + { + m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, FSEND); + + const SdrObjGroup* pObjGroup = PTR_CAST(SdrObjGroup, sdrObj); + m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Choice, + XML_Requires, (pObjGroup ? "wpg" : "wps"), + FSEND); + m_pImpl->writeDMLDrawing(sdrObj, &rFrmFmt, nAnchorId); + m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Choice); - m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND); - writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft); - m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Fallback); + m_pImpl->m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND); + writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft); + m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_Fallback); - m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_AlternateContent); + m_pImpl->m_pSerializer->endElementNS(XML_mc, XML_AlternateContent); + } + else + writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft); } void DocxSdrExport::writeDiagram(const SdrObject* sdrObject, const Size& size) |