diff options
| author | Noel Grandin <noel@peralex.com> | 2012-06-22 17:48:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-25 20:13:19 +0200 |
| commit | 3a92dc80e39b9c92571324b04c6be3b73e4c02f9 (patch) | |
| tree | 9f33f21d8519e36a944b88c8ca5e69106ace0530 | |
| parent | afa691c22026e0b525e6ce76c6f8a2333d7f2202 (diff) | |
Convert local var from Svptrarr to std::vector
Change-Id: I192bb3c923024b13346cfaa89f34bdddad8434cf
| -rw-r--r-- | sw/source/core/doc/tblrwcl.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index f56f878be7e1..7d50585dc013 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -1313,7 +1313,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC aFndBox.DelFrms( *this ); _CpyTabFrms aFrmArr; - SvPtrarr aLastBoxArr; + std::vector<SwTableBoxFmt*> aLastBoxArr; sal_uInt16 nFndPos; for( sal_uInt16 n = 0; n < aSelBoxes.Count(); ++n ) { @@ -1350,14 +1350,13 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC pLastBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nBoxSz - ( nNewBoxSz * nCnt ), 0 ) ); } - void* p = pLastBoxFmt; - aLastBoxArr.Insert( p, nFndPos ); + aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFmt ); } else { aFindFrm = aFrmArr[ nFndPos ]; pSelBox->ChgFrmFmt( (SwTableBoxFmt*)aFindFrm.pNewFrmFmt ); - pLastBoxFmt = (SwTableBoxFmt*)aLastBoxArr[ nFndPos ]; + pLastBoxFmt = aLastBoxArr[ nFndPos ]; } // Insert the Boxes at the Position @@ -1386,7 +1385,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC rCTF.Value.pFrmFmt == aFindFrm.pNewFrmFmt ) { aFrmArr.Remove( i ); - aLastBoxArr.Remove( i ); + aLastBoxArr.erase( aLastBoxArr.begin() + i ); } } } |