strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace List for std::vector<String>.

Browse source
This commit is contained in:
Rafael Dominguez 2011-05-21 18:24:08 -04:30 committed by Joseph Powers
parent 40e2f7f90a
commit 988d4d45a8
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sc/source/ui/view/cellsh.cxx
View file

@ -735,8 +735,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
case SID_SELECT_SCENARIO:
{
List aList;
std::vector<String> aList;
Color aDummyCol;
if ( !pDoc->IsScenario(nTab) )
@ -750,12 +749,12 @@ void ScCellShell::GetState(SfxItemSet &rSet)
while ( pDoc->IsScenario(nScTab) )
{
pDoc->GetName( nScTab, aStr );
aList.Insert( new String( aStr ), LIST_APPEND );
aList.push_back(aStr);
pDoc->GetScenarioData( nScTab, aStr, aDummyCol, nFlags );
aList.Insert( new String( aStr ), LIST_APPEND );
aList.push_back(aStr);
// Protection is sal_True if both Sheet and Scenario are protected
aProtect = (bSheetProtected && (nFlags & SC_SCENARIO_PROTECT)) ? '1' : '0';
aList.Insert( new String( aProtect), LIST_APPEND );
aList.push_back(aProtect);
++nScTab;
}
}
@ -764,15 +763,11 @@ void ScCellShell::GetState(SfxItemSet &rSet)
String aComment;
sal_uInt16 nDummyFlags;
pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags );
DBG_ASSERT( aList.Count() == 0, "List not empty!" );
aList.Insert( new String( aComment ) );
DBG_ASSERT( aList.empty(), "List not empty!" );
aList.push_back(aComment);
}
rSet.Put( SfxStringListItem( nWhich, &aList ) );
sal_uLong nCount = aList.Count();
for ( sal_uLong i=0; i<nCount; i++ )
delete (String*) aList.GetObject(i);
}
break;