From bca6b66358ec26ab6797c72207fdb42066451462 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 17 Mar 2015 09:12:39 +0100 Subject: DocxAttributeOutput::m_pFoot/EndnotesList: use std::unique_ptr Change-Id: Ia751c4bc62258760d00c233ecce0b2eda0fe9bfa --- sw/source/filter/ww8/docxattributeoutput.cxx | 3 --- sw/source/filter/ww8/docxattributeoutput.hxx | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 6b125c0ab0a7..64d9199a3e5d 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -8340,9 +8340,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri DocxAttributeOutput::~DocxAttributeOutput() { - delete m_pFootnotesList, m_pFootnotesList = NULL; - delete m_pEndnotesList, m_pEndnotesList = NULL; - delete m_pTableWrt, m_pTableWrt = NULL; delete m_pParagraphSdtPrTokenChildren; m_pParagraphSdtPrTokenChildren = NULL; delete m_pParagraphSdtPrTokenAttributes; m_pParagraphSdtPrTokenAttributes = NULL; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 234f35726baf..58c89c833abb 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -741,8 +741,8 @@ private: OUString m_sOriginalBackgroundColor; OUString m_hyperLinkAnchor; bool m_endPageRef; - ::docx::FootnotesList *m_pFootnotesList; - ::docx::FootnotesList *m_pEndnotesList; + std::unique_ptr m_pFootnotesList; + std::unique_ptr m_pEndnotesList; int m_footnoteEndnoteRefTag; boost::scoped_ptr< const WW8_SepInfo > m_pSectionInfo; -- cgit