Kaydet (Commit) 8bee34a7 authored tarafından Michael Stahl's avatar Michael Stahl

sw: replace boost::ptr_vector with std::vector<std::unique_ptr>

Change-Id: I12b440e445cb94c27a33e52646157b04add6b26a
üst fb5b2c55
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
#include <sfx2/childwin.hxx> #include <sfx2/childwin.hxx>
#include <boost/ptr_container/ptr_vector.hpp> #include <memory>
#include <vector>
#include <set> #include <set>
#include <map> #include <map>
#include <algorithm> #include <algorithm>
...@@ -1096,7 +1096,7 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) ...@@ -1096,7 +1096,7 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
// then there are RefFields in the DescDox - so all RefFields in the SourceDoc // then there are RefFields in the DescDox - so all RefFields in the SourceDoc
// need to be converted to have unique IDs for both documents // need to be converted to have unique IDs for both documents
_RefIdsMap aFntMap( aEmptyOUStr ); _RefIdsMap aFntMap( aEmptyOUStr );
boost::ptr_vector<_RefIdsMap> aFieldMap; std::vector<std::unique_ptr<_RefIdsMap>> aFieldMap;
SwIterator<SwFormatField,SwFieldType> aIter( *this ); SwIterator<SwFormatField,SwFieldType> aIter( *this );
for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() ) for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() )
...@@ -1109,16 +1109,16 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) ...@@ -1109,16 +1109,16 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc )
_RefIdsMap* pMap = 0; _RefIdsMap* pMap = 0;
for( auto n = aFieldMap.size(); n; ) for( auto n = aFieldMap.size(); n; )
{ {
if( aFieldMap[ --n ].GetName()==rRefField.GetSetRefName() ) if (aFieldMap[ --n ]->GetName() == rRefField.GetSetRefName())
{ {
pMap = &aFieldMap[ n ]; pMap = aFieldMap[ n ].get();
break; break;
} }
} }
if( !pMap ) if( !pMap )
{ {
pMap = new _RefIdsMap( rRefField.GetSetRefName() ); pMap = new _RefIdsMap( rRefField.GetSetRefName() );
aFieldMap.push_back( pMap ); aFieldMap.push_back(std::unique_ptr<_RefIdsMap>(pMap));
} }
pMap->Check( *pDoc, rDestDoc, rRefField, true ); pMap->Check( *pDoc, rDestDoc, rRefField, true );
......
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