diff options
| author | Noel Grandin <noel@peralex.com> | 2012-04-26 15:05:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-09 08:53:00 +0200 |
| commit | de4d4eb650358f14022389dabe975deffed1b96b (patch) | |
| tree | 6082bffadc07b85493681cdff51607afef755dc9 /sw/source/core/fields | |
| parent | b9d7b38ff260b227a70b8298c8c4956d48b8fa11 (diff) | |
Convert SV_DECL_PTRARR(SwTOXSortTabBases) to std::vector
Diffstat (limited to 'sw/source/core/fields')
| -rw-r--r-- | sw/source/core/fields/authfld.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 7c06cffb55d0..c85759d17554 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -339,7 +339,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle) SwTOXAuthority* pNew = new SwTOXAuthority( *pTxtNode, *pFmtFld, aIntl ); - for(short i = 0; i < aSortArr.Count(); ++i) + for(short i = 0; i < (short)aSortArr.size(); ++i) { SwTOXSortTabBase* pOld = aSortArr[i]; if(*pOld == *pNew) @@ -349,7 +349,11 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle) if(*pOld < *pNew) DELETEZ(pNew); else // remove the old content - aSortArr.DeleteAndDestroy( i, 1 ); + { + for (SwTOXSortTabBases::const_iterator it = aSortArr.begin(); it != aSortArr.end(); ++it) + delete *it; + aSortArr.clear(); + } break; } } @@ -358,25 +362,27 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle) { short j; - for( j = 0; j < aSortArr.Count(); ++j) + for( j = 0; j < (short)aSortArr.size(); ++j) { SwTOXSortTabBase* pOld = aSortArr[j]; if(*pNew < *pOld) break; } - aSortArr.Insert(pNew, j ); + aSortArr.insert(aSortArr.begin() + j, pNew); } } } - for(sal_uInt16 i = 0; i < aSortArr.Count(); i++) + for(sal_uInt16 i = 0; i < aSortArr.size(); i++) { const SwTOXSortTabBase& rBase = *aSortArr[i]; SwFmtFld& rFmtFld = ((SwTOXAuthority&)rBase).GetFldFmt(); SwAuthorityField* pAFld = (SwAuthorityField*)rFmtFld.GetFld(); m_SequArr.push_back(pAFld->GetHandle()); } - aSortArr.DeleteAndDestroy(0, aSortArr.Count()); + for (SwTOXSortTabBases::const_iterator it = aSortArr.begin(); it != aSortArr.end(); ++it) + delete *it; + aSortArr.clear(); } //find nHandle sal_uInt16 nRet = 0; |