diff options
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 16 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1b780e0a0333..94e3d6e2d246 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -311,7 +311,10 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT // Write the anchored frame if any if ( m_pParentFrame ) { - const SwFrmFmt& rFrmFmt = m_pParentFrame->GetFrmFmt( ); + sw::Frame *pParentFrame = m_pParentFrame; + m_pParentFrame = NULL; + + const SwFrmFmt& rFrmFmt = pParentFrame->GetFrmFmt( ); const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx(); sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1 : 0; @@ -319,12 +322,13 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT m_rExport.SaveData( nStt, nEnd ); - m_rExport.mpParentFrame = m_pParentFrame; - m_pParentFrame = NULL; + m_rExport.mpParentFrame = pParentFrame; m_rExport.WriteText( ); m_rExport.RestoreData(); + + delete pParentFrame; } } @@ -2477,8 +2481,8 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po break; case sw::Frame::eTxtBox: { - // The frame output is postponed at the end of the anchor paragraph - m_pParentFrame = &rFrame; + // The frame output is postponed to the end of the anchor paragraph + m_pParentFrame = new sw::Frame(rFrame); } break; case sw::Frame::eOle: @@ -4536,7 +4540,7 @@ DocxAttributeOutput::~DocxAttributeOutput() delete m_pEndnotesList, m_pEndnotesList = NULL; delete m_pTableWrt, m_pTableWrt = NULL; - m_pParentFrame = NULL; + delete m_pParentFrame; } DocxExport& DocxAttributeOutput::GetExport() 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; |