diff options
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 24 | ||||
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 10 |
2 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 365db5e55728..796cf7d56763 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -454,7 +454,7 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT comphelper::FlagRestorationGuard aStartedParaSdtGuard(m_bStartedParaSdt, false); assert(!m_pPostponedCustomShape); - m_pPostponedCustomShape.reset(new std::list<PostponedDrawing>); + m_pPostponedCustomShape.reset(new std::vector<PostponedDrawing>); for (size_t nIndex = 0; nIndex < m_aFramesOfParagraph.size(); ++nIndex) { m_bParagraphFrameOpen = true; @@ -1726,16 +1726,16 @@ void DocxAttributeOutput::StartRunProperties() InitCollectedRunProperties(); assert( !m_pPostponedGraphic ); - m_pPostponedGraphic.reset(new std::list<PostponedGraphic>); + m_pPostponedGraphic.reset(new std::vector<PostponedGraphic>); assert( !m_pPostponedDiagrams ); - m_pPostponedDiagrams.reset(new std::list<PostponedDiagram>); + m_pPostponedDiagrams.reset(new std::vector<PostponedDiagram>); assert(!m_pPostponedDMLDrawings); - m_pPostponedDMLDrawings.reset(new std::list<PostponedDrawing>); + m_pPostponedDMLDrawings.reset(new std::vector<PostponedDrawing>); assert( !m_pPostponedOLEs ); - m_pPostponedOLEs.reset(new std::list<PostponedOLE>); + m_pPostponedOLEs.reset(new std::vector<PostponedOLE>); } void DocxAttributeOutput::InitCollectedRunProperties() @@ -2087,7 +2087,7 @@ void DocxAttributeOutput::GetSdtEndBefore(const SdrObject* pSdrObj) void DocxAttributeOutput::WritePostponedGraphic() { - for( std::list< PostponedGraphic >::const_iterator it = m_pPostponedGraphic->begin(); + for( std::vector< PostponedGraphic >::const_iterator it = m_pPostponedGraphic->begin(); it != m_pPostponedGraphic->end(); ++it ) FlyFrameGraphic( it->grfNode, it->size, it->mOLEFrameFormat, it->mOLENode, it->pSdrObj ); @@ -2096,7 +2096,7 @@ void DocxAttributeOutput::WritePostponedGraphic() void DocxAttributeOutput::WritePostponedDiagram() { - for( std::list< PostponedDiagram >::const_iterator it = m_pPostponedDiagrams->begin(); + for( std::vector< PostponedDiagram >::const_iterator it = m_pPostponedDiagrams->begin(); it != m_pPostponedDiagrams->end(); ++it ) m_rExport.SdrExporter().writeDiagram( it->object, *(it->frame), m_anchorId++ ); @@ -4911,7 +4911,7 @@ void DocxAttributeOutput::WritePostponedOLE() if( !m_pPostponedOLEs ) return; - for( std::list< PostponedOLE >::iterator it = m_pPostponedOLEs->begin(); + for( std::vector< PostponedOLE >::iterator it = m_pPostponedOLEs->begin(); it != m_pPostponedOLEs->end(); ++it ) { @@ -5019,7 +5019,7 @@ void DocxAttributeOutput::WritePostponedCustomShape() return; bool bStartedParaSdt = m_bStartedParaSdt; - for( std::list< PostponedDrawing >::iterator it = m_pPostponedCustomShape->begin(); + for( std::vector< PostponedDrawing >::iterator it = m_pPostponedCustomShape->begin(); it != m_pPostponedCustomShape->end(); ++it ) { @@ -5038,11 +5038,11 @@ void DocxAttributeOutput::WritePostponedDMLDrawing() return; // Clear the list early, this method may be called recursively. - std::unique_ptr< std::list<PostponedDrawing> > pPostponedDMLDrawings(m_pPostponedDMLDrawings.release()); - std::unique_ptr< std::list<PostponedOLE> > pPostponedOLEs(m_pPostponedOLEs.release()); + std::unique_ptr< std::vector<PostponedDrawing> > pPostponedDMLDrawings(m_pPostponedDMLDrawings.release()); + std::unique_ptr< std::vector<PostponedOLE> > pPostponedOLEs(m_pPostponedOLEs.release()); bool bStartedParaSdt = m_bStartedParaSdt; - for( std::list< PostponedDrawing >::iterator it = pPostponedDMLDrawings->begin(); + for( std::vector< PostponedDrawing >::iterator it = pPostponedDMLDrawings->begin(); it != pPostponedDMLDrawings->end(); ++it ) { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 53c05ea2f65c..d06486403a07 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -843,14 +843,14 @@ private: SwOLENode* mOLENode; const SdrObject* pSdrObj; }; - std::unique_ptr< std::list<PostponedGraphic> > m_pPostponedGraphic; + std::unique_ptr< std::vector<PostponedGraphic> > m_pPostponedGraphic; struct PostponedDiagram { PostponedDiagram( const SdrObject* o, const SwFrameFormat* frm ) : object( o ), frame( frm ) {}; const SdrObject* object; const SwFrameFormat* frame; }; - std::unique_ptr< std::list<PostponedDiagram> > m_pPostponedDiagrams; + std::unique_ptr< std::vector<PostponedDiagram> > m_pPostponedDiagrams; struct PostponedDrawing { @@ -858,8 +858,8 @@ private: const SdrObject* object; const SwFrameFormat* frame; }; - std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedDMLDrawings; - std::unique_ptr< std::list<PostponedDrawing> > m_pPostponedCustomShape; + std::unique_ptr< std::vector<PostponedDrawing> > m_pPostponedDMLDrawings; + std::unique_ptr< std::vector<PostponedDrawing> > m_pPostponedCustomShape; struct PostponedOLE { @@ -868,7 +868,7 @@ private: const Size size; const SwFlyFrameFormat* frame; }; - std::unique_ptr< std::list<PostponedOLE> > m_pPostponedOLEs; + std::unique_ptr< std::vector<PostponedOLE> > m_pPostponedOLEs; std::vector<const SwOLENode*> m_aPostponedMaths; /// count charts consistently for unit tests |