diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-11 16:03:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-11 16:08:52 +0100 |
| commit | 8a0fc37a3714752b764d9d9b752913734412d46c (patch) | |
| tree | 14e037dcc92eae3db459e9ba0aab9d9bce9641c9 /sw | |
| parent | 863d91c20b4af0a281748d83f3bf359234bc7195 (diff) | |
DOCX textframe export: when in experimental mode, use DML instead of VML
Change-Id: Idf6a849b08fd76841d0dd5555e75b698e5d730cb
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 90198f713a33..77d11e7053e6 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -511,7 +511,22 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT { sw::Frame* pParentFrame = &aParentFrames[i]; m_pSerializer->startElementNS( XML_w, XML_r, FSEND ); - WriteVMLTextFrame(pParentFrame); + SvtMiscOptions aMiscOptions; + if (aMiscOptions.IsExperimentalMode()) + { + m_pSerializer->startElementNS(XML_mc, XML_AlternateContent, FSEND); + m_pSerializer->startElementNS(XML_mc, XML_Choice, + XML_Requires, "wps", + FSEND); + WriteDMLTextFrame(pParentFrame); + m_pSerializer->endElementNS(XML_mc, XML_Choice); + m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND); + WriteVMLTextFrame(pParentFrame); + m_pSerializer->endElementNS(XML_mc, XML_Fallback); + m_pSerializer->endElementNS(XML_mc, XML_AlternateContent); + } + else + WriteVMLTextFrame(pParentFrame); m_pSerializer->endElementNS( XML_w, XML_r ); } |