From 05b9c892b8568b076a6bc14f45c889e7cd5385ca Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 10 Nov 2015 14:51:47 +0200 Subject: editeng: boost::ptr_vector->std::vector Change-Id: I5b3d8e0e20938d8e66045ea6282f37afe29474e2 --- editeng/source/editeng/editobj.cxx | 36 ++++++++++++++++----------------- editeng/source/editeng/editobj2.hxx | 2 +- editeng/source/editeng/fieldupdater.cxx | 2 +- editeng/source/editeng/impedit4.cxx | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx index f2b7c97d2631..f0a4ec324d82 100644 --- a/editeng/source/editeng/editobj.cxx +++ b/editeng/source/editeng/editobj.cxx @@ -131,10 +131,10 @@ ContentInfo::ContentInfo( const ContentInfo& rCopyFrom, SfxItemPool& rPoolToUse for (size_t i = 0; i < rCopyFrom.aAttribs.size(); ++i) { - const XEditAttribute& rAttr = rCopyFrom.aAttribs[i]; + const XEditAttribute& rAttr = *rCopyFrom.aAttribs[i].get(); XEditAttribute* pMyAttr = MakeXEditAttribute( rPoolToUse, *rAttr.GetItem(), rAttr.GetStart(), rAttr.GetEnd()); - aAttribs.push_back(pMyAttr); + aAttribs.push_back(std::unique_ptr(pMyAttr)); } if ( rCopyFrom.GetWrongList() ) @@ -145,7 +145,7 @@ ContentInfo::~ContentInfo() { XEditAttributesType::iterator it = aAttribs.begin(), itEnd = aAttribs.end(); for (; it != itEnd; ++it) - aParaAttribs.GetPool()->Remove(*it->GetItem()); + aParaAttribs.GetPool()->Remove(*(*it)->GetItem()); aAttribs.clear(); } @@ -745,7 +745,7 @@ void EditTextObjectImpl::GetCharAttribs( sal_Int32 nPara, std::vectorWhich() == EE_FEATURE_FIELD) return static_cast(rX.GetItem()); } @@ -793,7 +793,7 @@ const SvxFieldData* EditTextObjectImpl::GetFieldData(sal_Int32 nPara, size_t nPo size_t nCurPos = 0; for (; it != itEnd; ++it) { - const XEditAttribute& rAttr = *it; + const XEditAttribute& rAttr = *it->get(); if (rAttr.GetItem()->Which() != EE_FEATURE_FIELD) // Skip attributes that are not fields. continue; @@ -823,7 +823,7 @@ bool EditTextObjectImpl::HasField( sal_Int32 nType ) const size_t nAttrs = rC.aAttribs.size(); for (size_t nAttr = 0; nAttr < nAttrs; ++nAttr) { - const XEditAttribute& rAttr = rC.aAttribs[nAttr]; + const XEditAttribute& rAttr = *rC.aAttribs[nAttr].get(); if (rAttr.GetItem()->Which() != EE_FEATURE_FIELD) continue; @@ -855,7 +855,7 @@ bool EditTextObjectImpl::RemoveCharAttribs( sal_uInt16 _nWhich ) for (size_t nAttr = rC.aAttribs.size(); nAttr; ) { - XEditAttribute& rAttr = rC.aAttribs[--nAttr]; + XEditAttribute& rAttr = *rC.aAttribs[--nAttr].get(); if ( !_nWhich || (rAttr.GetItem()->Which() == _nWhich) ) { pPool->Remove(*rAttr.GetItem()); @@ -913,7 +913,7 @@ void EditTextObjectImpl::GetAllSections( std::vector& rAttrs ) rBorders.push_back(rC.GetText().getLength()); for (size_t nAttr = 0; nAttr < rC.aAttribs.size(); ++nAttr) { - const XEditAttribute& rAttr = rC.aAttribs[nAttr]; + const XEditAttribute& rAttr = *rC.aAttribs[nAttr].get(); const SfxPoolItem* pItem = rAttr.GetItem(); if (!pItem) continue; @@ -979,7 +979,7 @@ void EditTextObjectImpl::GetAllSections( std::vector& rAttrs ) for (size_t i = 0; i < rC.aAttribs.size(); ++i) { - const XEditAttribute& rXAttr = rC.aAttribs[i]; + const XEditAttribute& rXAttr = *rC.aAttribs[i].get(); const SfxPoolItem* pItem = rXAttr.GetItem(); if (!pItem) continue; @@ -1082,15 +1082,15 @@ void EditTextObjectImpl::ChangeStyleSheetName( SfxStyleFamily eFamily, namespace { -class FindAttribByChar : public std::unary_function +class FindAttribByChar : public std::unary_function, bool> { sal_uInt16 mnWhich; sal_uInt16 mnChar; public: FindAttribByChar(sal_uInt16 nWhich, sal_uInt16 nChar) : mnWhich(nWhich), mnChar(nChar) {} - bool operator() (const XEditAttribute& rAttr) const + bool operator() (const std::unique_ptr& rAttr) const { - return (rAttr.GetItem()->Which() == mnWhich) && (rAttr.GetStart() <= mnChar) && (rAttr.GetEnd() > mnChar); + return (rAttr->GetItem()->Which() == mnWhich) && (rAttr->GetStart() <= mnChar) && (rAttr->GetEnd() > mnChar); } }; @@ -1145,7 +1145,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const } for (size_t nA = 0; nA < rC.aAttribs.size(); ++nA) { - const XEditAttribute& rAttr = rC.aAttribs[nA]; + const XEditAttribute& rAttr = *rC.aAttribs[nA].get(); if (rAttr.GetItem()->Which() == EE_CHAR_FONTINFO) { @@ -1227,7 +1227,7 @@ void EditTextObjectImpl::StoreData( SvStream& rOStream ) const // Which = 2; Surregat = 2; Start = 2; End = 2; for (size_t nAttr = 0; nAttr < nAttribs; ++nAttr) { - const XEditAttribute& rX = rC.aAttribs[nAttr]; + const XEditAttribute& rX = *rC.aAttribs[nAttr].get(); rOStream.WriteUInt16( rX.GetItem()->Which() ); GetPool()->StoreSurrogate(rOStream, rX.GetItem()); @@ -1366,7 +1366,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) else { XEditAttribute* pAttr = new XEditAttribute( *pItem, nStart, nEnd ); - pC->aAttribs.push_back(pAttr); + pC->aAttribs.push_back(std::unique_ptr(pAttr)); if ( ( _nWhich >= EE_FEATURE_START ) && ( _nWhich <= EE_FEATURE_END ) ) { @@ -1395,7 +1395,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) for (size_t nAttr = pC->aAttribs.size(); nAttr; ) { - const XEditAttribute& rAttr = pC->aAttribs[--nAttr]; + const XEditAttribute& rAttr = *pC->aAttribs[--nAttr].get(); if ( rAttr.GetItem()->Which() == EE_CHAR_FONTINFO ) { const SvxFontItem& rFontItem = static_cast(*rAttr.GetItem()); @@ -1420,7 +1420,7 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream ) pPool->Remove(*rAttr.GetItem()); pC->aAttribs.erase(pC->aAttribs.begin()+nAttr); - pC->aAttribs.insert(pC->aAttribs.begin()+nAttr, pNewAttr); + pC->aAttribs.insert(pC->aAttribs.begin()+nAttr, std::unique_ptr(pNewAttr)); for ( sal_uInt16 nChar = pNewAttr->GetStart(); nChar < pNewAttr->GetEnd(); nChar++ ) { diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index f732aaadd003..4c0c5902e565 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -128,7 +128,7 @@ class ContentInfo : boost::noncopyable { friend class EditTextObjectImpl; public: - typedef boost::ptr_vector XEditAttributesType; + typedef std::vector > XEditAttributesType; private: svl::SharedString maText; diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx index 80a35e950c6d..31e69422fa76 100644 --- a/editeng/source/editeng/fieldupdater.cxx +++ b/editeng/source/editeng/fieldupdater.cxx @@ -35,7 +35,7 @@ public: ContentInfo::XEditAttributesType& rAttribs = rContent.GetAttribs(); for (size_t j = 0; j < rAttribs.size(); ++j) { - XEditAttribute& rAttr = rAttribs[j]; + XEditAttribute& rAttr = *rAttribs[j].get(); const SfxPoolItem* pItem = rAttr.GetItem(); if (pItem->Which() != EE_FEATURE_FIELD) // This is not a field item. diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 4f3e2bd908d8..db3df69a9b1c 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1111,7 +1111,7 @@ EditTextObject* ImpEditEngine::CreateTextObject( EditSelection aSel, SfxItemPool if ( !pX->GetLen() && !bEmptyPara ) pTxtObj->mpImpl->DestroyAttrib(pX); else - pC->GetAttribs().push_back(pX); + pC->GetAttribs().push_back(std::unique_ptr(pX)); } nAttr++; pAttr = GetAttrib( pNode->GetCharAttribs().GetAttribs(), nAttr ); @@ -1259,7 +1259,7 @@ EditSelection ImpEditEngine::InsertTextObject( const EditTextObject& rTextObject bool bUpdateFields = false; for (size_t nAttr = 0; nAttr < nNewAttribs; ++nAttr) { - const XEditAttribute& rX = pC->GetAttribs()[nAttr]; + const XEditAttribute& rX = *pC->GetAttribs()[nAttr].get(); // Can happen when paragraphs > 16K, it is simply wrapped. if ( rX.GetEnd() <= aPaM.GetNode()->Len() ) { -- cgit v1.2.3