diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-21 11:43:41 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-21 12:02:36 +0200 |
| commit | f97583711b0c5159ba6d1144395489cdfe9a7ac8 (patch) | |
| tree | de7747615f620f446a8f1c84dcf1e64629f48741 /sw | |
| parent | f8bf090bbba61e8cd198a936dcc25f35fdf23c10 (diff) | |
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
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx | bin | 0 -> 32829 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx b/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx Binary files differnew file mode 100644 index 000000000000..23f40f14cbde --- /dev/null +++ b/sw/qa/core/exportdata/ooxml/pass/textframe-in-shape.docx diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 05a22ba4a52d..5e59bcca62a6 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); |