Kaydet (Commit) 3a92dc80 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl

Convert local var from Svptrarr to std::vector

Change-Id: I192bb3c923024b13346cfaa89f34bdddad8434cf
üst afa691c2
...@@ -1313,7 +1313,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC ...@@ -1313,7 +1313,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC
aFndBox.DelFrms( *this ); aFndBox.DelFrms( *this );
_CpyTabFrms aFrmArr; _CpyTabFrms aFrmArr;
SvPtrarr aLastBoxArr; std::vector<SwTableBoxFmt*> aLastBoxArr;
sal_uInt16 nFndPos; sal_uInt16 nFndPos;
for( sal_uInt16 n = 0; n < aSelBoxes.Count(); ++n ) 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 ...@@ -1350,14 +1350,13 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC
pLastBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, pLastBoxFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE,
nBoxSz - ( nNewBoxSz * nCnt ), 0 ) ); nBoxSz - ( nNewBoxSz * nCnt ), 0 ) );
} }
void* p = pLastBoxFmt; aLastBoxArr.insert( aLastBoxArr.begin() + nFndPos, pLastBoxFmt );
aLastBoxArr.Insert( p, nFndPos );
} }
else else
{ {
aFindFrm = aFrmArr[ nFndPos ]; aFindFrm = aFrmArr[ nFndPos ];
pSelBox->ChgFrmFmt( (SwTableBoxFmt*)aFindFrm.pNewFrmFmt ); pSelBox->ChgFrmFmt( (SwTableBoxFmt*)aFindFrm.pNewFrmFmt );
pLastBoxFmt = (SwTableBoxFmt*)aLastBoxArr[ nFndPos ]; pLastBoxFmt = aLastBoxArr[ nFndPos ];
} }
// Insert the Boxes at the Position // Insert the Boxes at the Position
...@@ -1386,7 +1385,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC ...@@ -1386,7 +1385,7 @@ sal_Bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nC
rCTF.Value.pFrmFmt == aFindFrm.pNewFrmFmt ) rCTF.Value.pFrmFmt == aFindFrm.pNewFrmFmt )
{ {
aFrmArr.Remove( i ); aFrmArr.Remove( i );
aLastBoxArr.Remove( i ); aLastBoxArr.erase( aLastBoxArr.begin() + i );
} }
} }
} }
......
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