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

DocxAttributeOutput::m_postponedVMLDrawing: use std::unique_ptr<>

Change-Id: I2534601941c6bf838855a378c540771335daf5f9
üst 79f64d75
...@@ -1602,8 +1602,8 @@ void DocxAttributeOutput::StartRunProperties() ...@@ -1602,8 +1602,8 @@ void DocxAttributeOutput::StartRunProperties()
OSL_ASSERT( !m_pPostponedDiagrams ); OSL_ASSERT( !m_pPostponedDiagrams );
m_pPostponedDiagrams.reset(new std::list<PostponedDiagram>()); m_pPostponedDiagrams.reset(new std::list<PostponedDiagram>());
OSL_ASSERT( m_postponedVMLDrawing == NULL ); OSL_ASSERT( !m_pPostponedVMLDrawings );
m_postponedVMLDrawing = new std::list< PostponedDrawing >; m_pPostponedVMLDrawings.reset(new std::list<PostponedDrawing>());
assert(!m_postponedDMLDrawing); assert(!m_postponedDMLDrawing);
m_postponedDMLDrawing = new std::list< PostponedDrawing >; m_postponedDMLDrawing = new std::list< PostponedDrawing >;
...@@ -4710,17 +4710,16 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S ...@@ -4710,17 +4710,16 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const S
*/ */
void DocxAttributeOutput::WritePostponedVMLDrawing() void DocxAttributeOutput::WritePostponedVMLDrawing()
{ {
if(m_postponedVMLDrawing == NULL) if (!m_pPostponedVMLDrawings)
return; return;
for( std::list< PostponedDrawing >::iterator it = m_postponedVMLDrawing->begin(); for( std::list< PostponedDrawing >::iterator it = m_pPostponedVMLDrawings->begin();
it != m_postponedVMLDrawing->end(); it != m_pPostponedVMLDrawings->end();
++it ) ++it )
{ {
m_rExport.SdrExporter().writeVMLDrawing(it->object, *(it->frame), *(it->point)); m_rExport.SdrExporter().writeVMLDrawing(it->object, *(it->frame), *(it->point));
} }
delete m_postponedVMLDrawing; m_pPostponedVMLDrawings.reset(0);
m_postponedVMLDrawing = NULL;
} }
void DocxAttributeOutput::WritePostponedCustomShape() void DocxAttributeOutput::WritePostponedCustomShape()
...@@ -8282,7 +8281,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri ...@@ -8282,7 +8281,6 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri
m_startedHyperlink( false ), m_startedHyperlink( false ),
m_nHyperLinkCount(0), m_nHyperLinkCount(0),
m_nFieldsInHyperlink( 0 ), m_nFieldsInHyperlink( 0 ),
m_postponedVMLDrawing(NULL),
m_postponedDMLDrawing(NULL), m_postponedDMLDrawing(NULL),
m_postponedMath( NULL ), m_postponedMath( NULL ),
m_postponedChart( NULL ), m_postponedChart( NULL ),
......
...@@ -848,7 +848,7 @@ private: ...@@ -848,7 +848,7 @@ private:
const SwFrmFmt* frame; const SwFrmFmt* frame;
const Point* point; const Point* point;
}; };
std::list< PostponedDrawing >* m_postponedVMLDrawing; std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedVMLDrawings;
std::list< PostponedDrawing >* m_postponedDMLDrawing; std::list< PostponedDrawing >* m_postponedDMLDrawing;
std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedCustomShape; std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedCustomShape;
......
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