diff options
Diffstat (limited to 'sdext/source/pdfimport/tree/writertreevisiting.cxx')
| -rw-r--r-- | sdext/source/pdfimport/tree/writertreevisiting.cxx | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx index 981882945350..e66a5fea81a9 100644 --- a/sdext/source/pdfimport/tree/writertreevisiting.cxx +++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx @@ -36,12 +36,12 @@ using namespace ::com::sun::star; namespace pdfi { -void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { if( elem.Children.empty() ) return; - const char* pType = dynamic_cast<DrawElement*>(elem.Children.front()) ? "draw:a" : "text:a"; + const char* pType = dynamic_cast<DrawElement*>(elem.Children.front().get()) ? "draw:a" : "text:a"; PropertyMap aProps; aProps[ "xlink:type" ] = "simple"; @@ -50,8 +50,8 @@ void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* aProps[ "xlink:show" ] = "new"; m_rEmitContext.rEmitter.beginTag( pType, aProps ); - std::list< Element* >::iterator this_it = elem.Children.begin(); - while( this_it !=elem.Children.end() && *this_it != &elem ) + auto this_it = elem.Children.begin(); + while( this_it != elem.Children.end() && this_it->get() != &elem ) { (*this_it)->visitedBy( *this, this_it ); ++this_it; @@ -59,7 +59,7 @@ void WriterXmlEmitter::visit( HyperlinkElement& elem, const std::list< Element* m_rEmitContext.rEmitter.endTag( pType ); } -void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( TextElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { if( elem.Text.isEmpty() ) return; @@ -73,8 +73,8 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co m_rEmitContext.rEmitter.beginTag( "text:span", aProps ); m_rEmitContext.rEmitter.write( elem.Text.makeStringAndClear() ); - std::list< Element* >::iterator this_it = elem.Children.begin(); - while( this_it !=elem.Children.end() && *this_it != &elem ) + auto this_it = elem.Children.begin(); + while( this_it != elem.Children.end() && this_it->get() != &elem ) { (*this_it)->visitedBy( *this, this_it ); ++this_it; @@ -83,7 +83,7 @@ void WriterXmlEmitter::visit( TextElement& elem, const std::list< Element* >::co m_rEmitContext.rEmitter.endTag( "text:span" ); } -void WriterXmlEmitter::visit( ParagraphElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( ParagraphElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { PropertyMap aProps; if( elem.StyleId != -1 ) @@ -95,8 +95,8 @@ void WriterXmlEmitter::visit( ParagraphElement& elem, const std::list< Element* pTagType = "text:h"; m_rEmitContext.rEmitter.beginTag( pTagType, aProps ); - std::list< Element* >::iterator this_it = elem.Children.begin(); - while( this_it !=elem.Children.end() && *this_it != &elem ) + auto this_it = elem.Children.begin(); + while( this_it != elem.Children.end() && this_it->get() != &elem ) { (*this_it)->visitedBy( *this, this_it ); ++this_it; @@ -203,20 +203,20 @@ void WriterXmlEmitter::fillFrameProps( DrawElement& rElem, } } -void WriterXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( FrameElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { if( elem.Children.empty() ) return; - bool bTextBox = (dynamic_cast<ParagraphElement*>(elem.Children.front()) != nullptr); + bool bTextBox = (dynamic_cast<ParagraphElement*>(elem.Children.front().get()) != nullptr); PropertyMap aFrameProps; fillFrameProps( elem, aFrameProps, m_rEmitContext ); m_rEmitContext.rEmitter.beginTag( "draw:frame", aFrameProps ); if( bTextBox ) m_rEmitContext.rEmitter.beginTag( "draw:text-box", PropertyMap() ); - std::list< Element* >::iterator this_it = elem.Children.begin(); - while( this_it !=elem.Children.end() && *this_it != &elem ) + auto this_it = elem.Children.begin(); + while( this_it != elem.Children.end() && this_it->get() != &elem ) { (*this_it)->visitedBy( *this, this_it ); ++this_it; @@ -227,7 +227,7 @@ void WriterXmlEmitter::visit( FrameElement& elem, const std::list< Element* >::c m_rEmitContext.rEmitter.endTag( "draw:frame" ); } -void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { elem.updateGeometry(); /* note: @@ -293,7 +293,7 @@ void WriterXmlEmitter::visit( PolyPolyElement& elem, const std::list< Element* > m_rEmitContext.rEmitter.endTag( "draw:path" ); } -void WriterXmlEmitter::visit( ImageElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( ImageElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { PropertyMap aImageProps; m_rEmitContext.rEmitter.beginTag( "draw:image", aImageProps ); @@ -303,34 +303,34 @@ void WriterXmlEmitter::visit( ImageElement& elem, const std::list< Element* >::c m_rEmitContext.rEmitter.endTag( "draw:image" ); } -void WriterXmlEmitter::visit( PageElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlEmitter::visit( PageElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { if( m_rEmitContext.xStatusIndicator.is() ) m_rEmitContext.xStatusIndicator->setValue( elem.PageNumber ); - std::list< Element* >::iterator this_it = elem.Children.begin(); - while( this_it !=elem.Children.end() && *this_it != &elem ) + auto this_it = elem.Children.begin(); + while( this_it != elem.Children.end() && this_it->get() != &elem ) { (*this_it)->visitedBy( *this, this_it ); ++this_it; } } -void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< Element* >::const_iterator&) +void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator&) { m_rEmitContext.rEmitter.beginTag( "office:body", PropertyMap() ); m_rEmitContext.rEmitter.beginTag( "office:text", PropertyMap() ); - for( std::list< Element* >::iterator it = elem.Children.begin(); it != elem.Children.end(); ++it ) + for( auto it = elem.Children.begin(); it != elem.Children.end(); ++it ) { - PageElement* pPage = dynamic_cast<PageElement*>(*it); + PageElement* pPage = dynamic_cast<PageElement*>(it->get()); if( pPage ) { // emit only page anchored objects // currently these are only DrawElement types - for( std::list< Element* >::iterator child_it = pPage->Children.begin(); child_it != pPage->Children.end(); ++child_it ) + for( auto child_it = pPage->Children.begin(); child_it != pPage->Children.end(); ++child_it ) { - if( dynamic_cast<DrawElement*>(*child_it) != nullptr ) + if( dynamic_cast<DrawElement*>(child_it->get()) != nullptr ) (*child_it)->visitedBy( *this, child_it ); } } @@ -339,9 +339,9 @@ void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< Element* > // do not emit page anchored objects, they are emitted before // (must precede all pages in writer document) currently these are // only DrawElement types - for( std::list< Element* >::iterator it = elem.Children.begin(); it != elem.Children.end(); ++it ) + for( auto it = elem.Children.begin(); it != elem.Children.end(); ++it ) { - if( dynamic_cast<DrawElement*>(*it) == nullptr ) + if( dynamic_cast<DrawElement*>(it->get()) == nullptr ) (*it)->visitedBy( *this, it ); } @@ -350,24 +350,24 @@ void WriterXmlEmitter::visit( DocumentElement& elem, const std::list< Element* > } -void WriterXmlOptimizer::visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) +void WriterXmlOptimizer::visit( HyperlinkElement&, const std::list< std::unique_ptr<Element> >::const_iterator& ) { } -void WriterXmlOptimizer::visit( TextElement&, const std::list< Element* >::const_iterator&) +void WriterXmlOptimizer::visit( TextElement&, const std::list< std::unique_ptr<Element> >::const_iterator&) { } -void WriterXmlOptimizer::visit( FrameElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlOptimizer::visit( FrameElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { elem.applyToChildren(*this); } -void WriterXmlOptimizer::visit( ImageElement&, const std::list< Element* >::const_iterator& ) +void WriterXmlOptimizer::visit( ImageElement&, const std::list< std::unique_ptr<Element> >::const_iterator& ) { } -void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& elemIt ) +void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& elemIt ) { /* note: optimize two consecutive PolyPolyElements that * have the same path but one of which is a stroke while @@ -378,12 +378,12 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* // find following PolyPolyElement in parent's children list if( elemIt == elem.Parent->Children.end() ) return; - std::list< Element* >::const_iterator next_it = elemIt; + auto next_it = elemIt; ++next_it; if( next_it == elem.Parent->Children.end() ) return; - PolyPolyElement* pNext = dynamic_cast<PolyPolyElement*>(*next_it); + PolyPolyElement* pNext = dynamic_cast<PolyPolyElement*>(next_it->get()); if( !pNext || pNext->PolyPoly != elem.PolyPoly ) return; @@ -413,7 +413,7 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* elem.Children.splice( elem.Children.end(), pNext->Children ); // workaround older compilers that do not have std::list::erase(const_iterator) #if HAVE_BROKEN_CONST_ITERATORS - std::list< Element* >::iterator tmpIt = elem.Parent->Children.begin(); + auto tmpIt = elem.Parent->Children.begin(); std::advance(tmpIt, std::distance(elem.Parent->Children.cbegin(), next_it)); elem.Parent->Children.erase(tmpIt); #else @@ -423,7 +423,7 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< Element* } } -void WriterXmlOptimizer::visit( ParagraphElement& elem, const std::list< Element* >::const_iterator& rParentIt) +void WriterXmlOptimizer::visit( ParagraphElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& rParentIt) { optimizeTextElements( elem ); @@ -432,12 +432,12 @@ void WriterXmlOptimizer::visit( ParagraphElement& elem, const std::list< Element if( elem.Parent && rParentIt != elem.Parent->Children.end() ) { // find if there is a previous paragraph that might be a heading for this one - std::list<Element*>::const_iterator prev = rParentIt; + auto prev = rParentIt; ParagraphElement* pPrevPara = nullptr; while( prev != elem.Parent->Children.begin() ) { --prev; - pPrevPara = dynamic_cast< ParagraphElement* >(*prev); + pPrevPara = dynamic_cast< ParagraphElement* >(prev->get()); if( pPrevPara ) { /* What constitutes a heading ? current hints are: @@ -480,7 +480,7 @@ void WriterXmlOptimizer::visit( ParagraphElement& elem, const std::list< Element } } -void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlOptimizer::visit( PageElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { if( m_rProcessor.getStatusIndicator().is() ) m_rProcessor.getStatusIndicator()->setValue( elem.PageNumber ); @@ -496,7 +496,7 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: // find paragraphs in text ParagraphElement* pCurPara = nullptr; - std::list< Element* >::iterator page_element, next_page_element; + std::list< std::unique_ptr<Element> >::iterator page_element, next_page_element; next_page_element = elem.Children.begin(); double fCurLineHeight = 0.0; // average height of text items in current para int nCurLineElements = 0; // number of line contributing elements in current para @@ -506,17 +506,17 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: while( next_page_element != elem.Children.end() ) { page_element = next_page_element++; - ParagraphElement* pPagePara = dynamic_cast<ParagraphElement*>(*page_element); + ParagraphElement* pPagePara = dynamic_cast<ParagraphElement*>(page_element->get()); if( pPagePara ) { pCurPara = pPagePara; // adjust line height and text items fCurLineHeight = 0.0; nCurLineElements = 0; - for( std::list< Element* >::iterator it = pCurPara->Children.begin(); + for( auto it = pCurPara->Children.begin(); it != pCurPara->Children.end(); ++it ) { - TextElement* pTestText = dynamic_cast<TextElement*>(*it); + TextElement* pTestText = dynamic_cast<TextElement*>(it->get()); if( pTestText ) { fCurLineHeight = (fCurLineHeight*double(nCurLineElements) + pTestText->h)/double(nCurLineElements+1); @@ -526,10 +526,10 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: continue; } - HyperlinkElement* pLink = dynamic_cast<HyperlinkElement*>(*page_element); - DrawElement* pDraw = dynamic_cast<DrawElement*>(*page_element); + HyperlinkElement* pLink = dynamic_cast<HyperlinkElement*>(page_element->get()); + DrawElement* pDraw = dynamic_cast<DrawElement*>(page_element->get()); if( ! pDraw && pLink && ! pLink->Children.empty() ) - pDraw = dynamic_cast<DrawElement*>(pLink->Children.front() ); + pDraw = dynamic_cast<DrawElement*>(pLink->Children.front().get() ); if( pDraw ) { // insert small drawing objects as character, else leave them page bound @@ -550,12 +550,12 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: // or perhaps the draw element begins a new paragraph else if( next_page_element != elem.Children.end() ) { - TextElement* pText = dynamic_cast<TextElement*>(*next_page_element); + TextElement* pText = dynamic_cast<TextElement*>(next_page_element->get()); if( ! pText ) { - ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(*next_page_element); + ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(next_page_element->get()); if( pPara && ! pPara->Children.empty() ) - pText = dynamic_cast<TextElement*>(pPara->Children.front()); + pText = dynamic_cast<TextElement*>(pPara->Children.front().get()); } if( pText && // check there is a text pDraw->h < pText->h*1.5 && // and it is approx the same height @@ -584,9 +584,9 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: } } - TextElement* pText = dynamic_cast<TextElement*>(*page_element); + TextElement* pText = dynamic_cast<TextElement*>(page_element->get()); if( ! pText && pLink && ! pLink->Children.empty() ) - pText = dynamic_cast<TextElement*>(pLink->Children.front()); + pText = dynamic_cast<TextElement*>(pLink->Children.front().get()); if( pText ) { Element* pGeo = pLink ? static_cast<Element*>(pLink) : @@ -638,14 +638,14 @@ void WriterXmlOptimizer::visit( PageElement& elem, const std::list< Element* >:: // set parent pCurPara->Parent = &elem; //insert new paragraph before current element - page_element = elem.Children.insert( page_element, pCurPara ); + page_element = elem.Children.insert( page_element, std::unique_ptr<Element>(pCurPara) ); // forward iterator to current element again ++ page_element; // update next_element which is now invalid next_page_element = page_element; ++ next_page_element; } - Element* pCurEle = *page_element; + Element* pCurEle = page_element->get(); Element::setParent( page_element, pCurPara ); OSL_ENSURE( !pText || pCurEle == pText || pCurEle == pLink, "paragraph child list in disorder" ); if( pText || pDraw ) @@ -673,25 +673,25 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem ) // detect header // Note: the following assumes that the pages' children have been // sorted geometrically - std::list< Element* >::iterator it = rElem.Children.begin(); + auto it = rElem.Children.begin(); while( it != rElem.Children.end() ) { - ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(*it); + ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(it->get()); if( pPara ) { if( pPara->y+pPara->h < rElem.h*0.15 && pPara->isSingleLined( m_rProcessor ) ) { - std::list< Element* >::iterator next_it = it; + auto next_it = it; ParagraphElement* pNextPara = nullptr; while( ++next_it != rElem.Children.end() && pNextPara == nullptr ) { - pNextPara = dynamic_cast<ParagraphElement*>(*next_it); + pNextPara = dynamic_cast<ParagraphElement*>(next_it->get()); } if( pNextPara && pNextPara->y > pPara->y+pPara->h*2 ) { - rElem.HeaderElement = pPara; + rElem.HeaderElement = std::move(*it); pPara->Parent = nullptr; - rElem.Children.remove( pPara ); + rElem.Children.erase( it ); } } break; @@ -700,25 +700,25 @@ void WriterXmlOptimizer::checkHeaderAndFooter( PageElement& rElem ) } // detect footer - std::list< Element* >::reverse_iterator rit = rElem.Children.rbegin(); + std::list< std::unique_ptr<Element> >::reverse_iterator rit = rElem.Children.rbegin(); while( rit != rElem.Children.rend() ) { - ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(*rit); + ParagraphElement* pPara = dynamic_cast<ParagraphElement*>(rit->get()); if( pPara ) { if( pPara->y > rElem.h*0.85 && pPara->isSingleLined( m_rProcessor ) ) { - std::list< Element* >::reverse_iterator next_it = rit; + std::list< std::unique_ptr<Element> >::reverse_iterator next_it = rit; ParagraphElement* pNextPara = nullptr; while( ++next_it != rElem.Children.rend() && pNextPara == nullptr ) { - pNextPara = dynamic_cast<ParagraphElement*>(*next_it); + pNextPara = dynamic_cast<ParagraphElement*>(next_it->get()); } if( pNextPara && pNextPara->y < pPara->y-pPara->h*2 ) { - rElem.FooterElement = pPara; + rElem.FooterElement = std::move(*rit); pPara->Parent = nullptr; - rElem.Children.remove( pPara ); + rElem.Children.erase( std::next(rit).base() ); } } break; @@ -736,8 +736,8 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) } // concatenate child elements with same font id - std::list< Element* >::iterator next = rParent.Children.begin(); - std::list< Element* >::iterator it = next++; + auto next = rParent.Children.begin(); + auto it = next++; FrameElement* pFrame = dynamic_cast<FrameElement*>(rParent.Parent); bool bRotatedFrame = false; if( pFrame ) @@ -749,10 +749,10 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) while( next != rParent.Children.end() ) { bool bConcat = false; - TextElement* pCur = dynamic_cast<TextElement*>(*it); + TextElement* pCur = dynamic_cast<TextElement*>(it->get()); if( pCur ) { - TextElement* pNext = dynamic_cast<TextElement*>(*next); + TextElement* pNext = dynamic_cast<TextElement*>(next->get()); if( pNext ) { const GraphicsContext& rCurGC = m_rProcessor.getGraphicsContext( pCur->GCId ); @@ -824,7 +824,7 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) } } } - else if( dynamic_cast<HyperlinkElement*>(*it) ) + else if( dynamic_cast<HyperlinkElement*>(it->get()) ) optimizeTextElements( **it ); if( bConcat ) { @@ -839,13 +839,13 @@ void WriterXmlOptimizer::optimizeTextElements(Element& rParent) } } -void WriterXmlOptimizer::visit( DocumentElement& elem, const std::list< Element* >::const_iterator&) +void WriterXmlOptimizer::visit( DocumentElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator&) { elem.applyToChildren(*this); } -void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { // xxx TODO copied from DrawElement const GraphicsContext& rGC = m_rProcessor.getGraphicsContext(elem.GCId ); @@ -900,11 +900,11 @@ void WriterXmlFinalizer::visit( PolyPolyElement& elem, const std::list< Element* elem.StyleId = m_rStyleContainer.getStyleId( aStyle ); } -void WriterXmlFinalizer::visit( HyperlinkElement&, const std::list< Element* >::const_iterator& ) +void WriterXmlFinalizer::visit( HyperlinkElement&, const std::list< std::unique_ptr<Element> >::const_iterator& ) { } -void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlFinalizer::visit( TextElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { const FontAttributes& rFont = m_rProcessor.getFont( elem.FontId ); PropertyMap aProps; @@ -958,7 +958,7 @@ void WriterXmlFinalizer::visit( TextElement& elem, const std::list< Element* >:: elem.StyleId = m_rStyleContainer.getStyleId( aStyle ); } -void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element* >::const_iterator& rParentIt ) +void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& rParentIt ) { PropertyMap aParaProps; @@ -1001,10 +1001,10 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element // check whether to leave some space to next paragraph // find whether there is a next paragraph - std::list< Element* >::const_iterator it = rParentIt; + auto it = rParentIt; const ParagraphElement* pNextPara = nullptr; while( ++it != elem.Parent->Children.end() && ! pNextPara ) - pNextPara = dynamic_cast< const ParagraphElement* >(*it); + pNextPara = dynamic_cast< const ParagraphElement* >(it->get()); if( pNextPara ) { if( pNextPara->y - (elem.y+elem.h) > convmm2Px( 10 ) ) @@ -1030,7 +1030,7 @@ void WriterXmlFinalizer::visit( ParagraphElement& elem, const std::list< Element elem.applyToChildren(*this); } -void WriterXmlFinalizer::visit( FrameElement& elem, const std::list< Element* >::const_iterator&) +void WriterXmlFinalizer::visit( FrameElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator&) { PropertyMap aProps; aProps[ "style:family" ] = "graphic"; @@ -1058,7 +1058,7 @@ void WriterXmlFinalizer::visit( FrameElement& elem, const std::list< Element* >: elem.applyToChildren(*this); } -void WriterXmlFinalizer::visit( ImageElement&, const std::list< Element* >::const_iterator& ) +void WriterXmlFinalizer::visit( ImageElement&, const std::list< std::unique_ptr<Element> >::const_iterator& ) { } @@ -1086,7 +1086,7 @@ void WriterXmlFinalizer::setFirstOnPage( ParagraphElement& rElem, } } -void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlFinalizer::visit( PageElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { if( m_rProcessor.getStatusIndicator().is() ) m_rProcessor.getStatusIndicator()->setValue( elem.PageNumber ); @@ -1101,9 +1101,9 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: elem.RightMargin = 0; // first element should be a paragraph ParagraphElement* pFirstPara = nullptr; - for( std::list< Element* >::const_iterator it = elem.Children.begin(); it != elem.Children.end(); ++it ) + for( auto it = elem.Children.begin(); it != elem.Children.end(); ++it ) { - if( dynamic_cast<ParagraphElement*>( *it ) ) + if( dynamic_cast<ParagraphElement*>( it->get() ) ) { if( (*it)->x < elem.LeftMargin ) elem.LeftMargin = (*it)->x; @@ -1114,7 +1114,7 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: if( (*it)->y + (*it)->h > elem.h - elem.BottomMargin ) elem.BottomMargin = elem.h - ((*it)->y + (*it)->h); if( ! pFirstPara ) - pFirstPara = dynamic_cast<ParagraphElement*>( *it ); + pFirstPara = dynamic_cast<ParagraphElement*>( it->get() ); } } if( elem.HeaderElement && elem.HeaderElement->y < elem.TopMargin ) @@ -1199,14 +1199,14 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: StyleContainer::Style aFooterStyle( "style:footer", PropertyMap() ); if( elem.HeaderElement ) { - elem.HeaderElement->visitedBy( *this, std::list<Element*>::iterator() ); - aHeaderStyle.ContainedElement = elem.HeaderElement; + elem.HeaderElement->visitedBy( *this, std::list<std::unique_ptr<Element>>::iterator() ); + aHeaderStyle.ContainedElement = elem.HeaderElement.get(); aMPStyle.SubStyles.push_back( &aHeaderStyle ); } if( elem.FooterElement ) { - elem.FooterElement->visitedBy( *this, std::list<Element*>::iterator() ); - aFooterStyle.ContainedElement = elem.FooterElement; + elem.FooterElement->visitedBy( *this, std::list<std::unique_ptr<Element>>::iterator() ); + aFooterStyle.ContainedElement = elem.FooterElement.get(); aMPStyle.SubStyles.push_back( &aFooterStyle ); } elem.StyleId = m_rStyleContainer.impl_getStyleId( aMPStyle,false ); @@ -1222,12 +1222,12 @@ void WriterXmlFinalizer::visit( PageElement& elem, const std::list< Element* >:: { pFirstPara = ElementFactory::createParagraphElement( nullptr ); pFirstPara->Parent = &elem; - elem.Children.push_front( pFirstPara ); + elem.Children.push_front( std::unique_ptr<Element>(pFirstPara) ); } setFirstOnPage(*pFirstPara, m_rStyleContainer, aMasterPageName); } -void WriterXmlFinalizer::visit( DocumentElement& elem, const std::list< Element* >::const_iterator& ) +void WriterXmlFinalizer::visit( DocumentElement& elem, const std::list< std::unique_ptr<Element> >::const_iterator& ) { elem.applyToChildren(*this); } |