[Libreoffice-commits] core.git: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 8a0fc37a3714752b764d9d9b752913734412d46c
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Dec 11 16:03:21 2013 +0100

    DOCX textframe export: when in experimental mode, use DML instead of VML
    
    Change-Id: Idf6a849b08fd76841d0dd5555e75b698e5d730cb

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 90198f7..77d11e7 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 );
     }