sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx |binary sw/source/filter/ww8/docxattributeoutput.cxx | 3 +++ 2 files changed, 3 insertions(+)
New commits: commit b3f4709d739743d744b8bb4c2231bb80772af2f6 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Tue Aug 19 12:47:07 2014 +0200 DOCX export: handle SDT around floating tables Change-Id: I07fedc201c51008baca3254dcc099f0182aa4c72 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 new file mode 100644 index 0000000..1d57e7b Binary files /dev/null and b/sw/qa/core/exportdata/ooxml/pass/sdt-around-float-table.docx differ diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d2c4f71..b3f2255 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) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits