summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/docxattributeoutput.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-11 12:20:07 +0100
committerPetr Mladek <pmladek@suse.cz>2012-11-05 17:34:05 +0100
commitc45024e14571ef28d171aff0747374f00b5176af (patch)
tree73b9cc657d60b5a0e56da558bc4992b39848fa51 /sw/source/filter/ww8/docxattributeoutput.hxx
parentdd22f7147e0929ae52043a0354306a8ee6710927 (diff)
Resolves: fdo#48569 crash on export to .docx of inline anchored frame
we're currently deferring to the end of the text node to export the contents of frames. If its anchored as character then the sw::Frame (which is allocated on stack) has gone out of scope so this pointer points to junk. Copy it instead. Sill need to export frames property at some stage. Change-Id: Ib9f8c6857ce1afe6acba84986b692139e44a7aad (cherry picked from commit 60a93729c95d31edab50a905236faa9e38a81556) Signed-off-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.hxx')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index c425ee85fffb..aca7a3d750b6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -588,7 +588,7 @@ private:
// beginning of the next paragraph
DocxColBreakStatus m_nColBreakStatus;
- const sw::Frame *m_pParentFrame;
+ sw::Frame *m_pParentFrame;
// close of hyperlink needed
bool m_closeHyperlinkInThisRun;
bool m_closeHyperlinkInPreviousRun;