diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-26 18:27:44 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-09 08:53:01 +0200 |
| commit | fb5f61de5d770f4e34da6ac5d034f3a3fc9b4c24 (patch) | |
| tree | 2666d564a0bdc18eb07db2dbb39f6f85246e8602 | |
| parent | 2d7e993f6a3acd01c5287497196565b8555416e6 (diff) | |
Convert SV_DECL_PTRARR_DEL(_RefIdsMaps) to boost::ptr_vector
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index c1104298468b..857bd2cef431 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -928,8 +928,7 @@ public: String GetName() { return aName; } }; -SV_DECL_PTRARR_DEL( _RefIdsMaps, _RefIdsMap*, 5 ) -SV_IMPL_PTRARR( _RefIdsMaps, _RefIdsMap* ) +typedef boost::ptr_vector<_RefIdsMap> _RefIdsMaps; /// Get a sorted list of the field IDs from a document. /// @param[in] rDoc The document to search. @@ -1091,18 +1090,18 @@ void SwGetRefFieldType::MergeWithOtherDoc( SwDoc& rDestDoc ) case REF_SEQUENCEFLD: { _RefIdsMap* pMap = 0; - for( sal_uInt16 n = aFldMap.Count(); n; ) + for( sal_uInt16 n = aFldMap.size(); n; ) { - if( aFldMap[ --n ]->GetName().Equals(rRefFld.GetSetRefName()) ) + if( aFldMap[ --n ].GetName().Equals(rRefFld.GetSetRefName()) ) { - pMap = aFldMap[ n ]; + pMap = &aFldMap[ n ]; break; } } if( !pMap ) { pMap = new _RefIdsMap( rRefFld.GetSetRefName() ); - aFldMap.C40_INSERT( _RefIdsMap, pMap, aFldMap.Count() ); + aFldMap.push_back( pMap ); } pMap->Check( *pDoc, rDestDoc, rRefFld, sal_True ); |