diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-11 10:43:07 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-11 11:24:25 +0000 |
| commit | 6a10a2940a82c7fb376fc1b5a7c940e0a849e15a (patch) | |
| tree | 0984f2dace35a9fdd92978c03c03ca621486b0d9 /sw/source/filter/ww8/docxattributeoutput.hxx | |
| parent | 262caa3bdefc8add38a0fa221099fb59b64b5b3d (diff) | |
fdo#58577 DOCX export: handle multiple textframes anchored to the same para
Also fixes ~SwIndexReg assertion on closing the document.
(cherry picked from commit e5b145a46cd29c9428e6e1894f7b0bb8248a412f)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I7c1a9d3d646f2dacdbced2af355c076c1a1063ec
Reviewed-on: https://gerrit.libreoffice.org/4826
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.hxx')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index d120f3048aa6..0854e46ea662 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -618,7 +618,7 @@ private: // beginning of the next paragraph DocxColBreakStatus m_nColBreakStatus; - sw::Frame *m_pParentFrame; + std::vector<sw::Frame> m_aParentFrames; bool m_bTextFrameSyntax; OStringBuffer m_aTextFrameStyle; // close of hyperlink needed |