diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-19 12:47:07 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-19 13:03:33 +0200 |
| commit | b3f4709d739743d744b8bb4c2231bb80772af2f6 (patch) | |
| tree | 967ec030f79d30a36694742876740c778e771756 | |
| parent | 8ae264eb2f4bcd8cfdf6561857630c031cecd206 (diff) | |
DOCX export: handle SDT around floating tables
Change-Id: I07fedc201c51008baca3254dcc099f0182aa4c72
| -rw-r--r-- | sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx | bin | 0 -> 12845 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx b/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx Binary files differnew file mode 100644 index 000000000000..1d57e7b85850 --- /dev/null +++ b/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d2c4f71735f9..b3f2255e3ad2 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -41,6 +41,7 @@ #include "wrtww8.hxx" #include <comphelper/string.hxx> +#include <comphelper/flagguard.hxx> #include <oox/token/tokens.hxx> #include <oox/export/utils.hxx> #include <oox/mathml/export.hxx> @@ -442,6 +443,8 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT ++m_nTextFrameLevel; if( m_nTextFrameLevel == 1 ) { + comphelper::FlagRestorationGuard aStartedParaSdtGuard(m_bStartedParaSdt, false); + assert(!m_postponedCustomShape); m_postponedCustomShape = new std::list< PostponedDrawing >; for (size_t nIndex = 0; nIndex < m_aFramesOfParagraph.size(); ++nIndex) |