Kaydet (Commit) c2f99275 authored tarafından Miklos Vajna's avatar Miklos Vajna

DocxAttributeOutput::m_pColorAttrList: use shared_ptr

Change-Id: I48083b6f984ade7ad574e1f51922e249fd08a96c
üst c4cfb4f4
...@@ -1883,8 +1883,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties() ...@@ -1883,8 +1883,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
if ( m_pColorAttrList ) if ( m_pColorAttrList )
{ {
XFastAttributeListRef xAttrList( m_pColorAttrList ); XFastAttributeListRef xAttrList( m_pColorAttrList.release() );
m_pColorAttrList = NULL;
m_pSerializer->singleElementNS( XML_w, XML_color, xAttrList ); m_pSerializer->singleElementNS( XML_w, XML_color, xAttrList );
} }
...@@ -8281,7 +8280,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri ...@@ -8281,7 +8280,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_bEndCharSdt(false), m_bEndCharSdt(false),
m_bStartedCharSdt(false), m_bStartedCharSdt(false),
m_bStartedParaSdt(false), m_bStartedParaSdt(false),
m_pColorAttrList( NULL ),
m_pBackgroundAttrList( NULL ), m_pBackgroundAttrList( NULL ),
m_endPageRef( false ), m_endPageRef( false ),
m_pFootnotesList( new ::docx::FootnotesList() ), m_pFootnotesList( new ::docx::FootnotesList() ),
...@@ -8347,7 +8345,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri ...@@ -8347,7 +8345,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
DocxAttributeOutput::~DocxAttributeOutput() DocxAttributeOutput::~DocxAttributeOutput()
{ {
delete m_pColorAttrList, m_pColorAttrList = NULL;
delete m_pBackgroundAttrList, m_pBackgroundAttrList = NULL; delete m_pBackgroundAttrList, m_pBackgroundAttrList = NULL;
delete m_pFootnotesList, m_pFootnotesList = NULL; delete m_pFootnotesList, m_pFootnotesList = NULL;
......
...@@ -735,7 +735,7 @@ private: ...@@ -735,7 +735,7 @@ private:
/// If an SDT around paragraphs is currently open. /// If an SDT around paragraphs is currently open.
bool m_bStartedParaSdt; bool m_bStartedParaSdt;
/// Attributes of the run color /// Attributes of the run color
::sax_fastparser::FastAttributeList *m_pColorAttrList; std::unique_ptr<sax_fastparser::FastAttributeList> m_pColorAttrList;
/// Attributes of the paragraph background /// Attributes of the paragraph background
::sax_fastparser::FastAttributeList *m_pBackgroundAttrList; ::sax_fastparser::FastAttributeList *m_pBackgroundAttrList;
OUString m_sOriginalBackgroundColor; OUString m_sOriginalBackgroundColor;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment