sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx |binary sw/source/filter/ww8/docxattributeoutput.cxx | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-)
New commits: commit f97583711b0c5159ba6d1144395489cdfe9a7ac8 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Aug 21 11:43:41 2014 +0200 DOCX export: handle anchored TextFrames inside shapes The exporter already handled TextFrames inside TextFrames, a feature supported by Writer, and not by Word. Similarly, if DocxSdrExport::writeDMLAndVMLDrawing() starts a shape, then anchored TextFrames should be posponed till the end of that shape. Change-Id: I597a8a46b1cf2348a8ccb9af668ea5afab27541b diff --git a/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx b/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx new file mode 100644 index 0000000..23f40f1 Binary files /dev/null and b/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx differ diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 05a22ba..5e59bcc 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -442,7 +442,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT // Write the anchored frame if any // Word can't handle nested text boxes, so write them on the same level. ++m_nTextFrameLevel; - if( m_nTextFrameLevel == 1 ) + if( m_nTextFrameLevel == 1 && !m_rExport.SdrExporter().IsDMLAndVMLDrawingOpen() ) { comphelper::FlagRestorationGuard aStartedParaSdtGuard(m_bStartedParaSdt, false); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits