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

Remove DECLARE_LIST( TargetList, String* )

Browse source
This commit is contained in:
Joseph Powers 2011-01-01 10:56:18 -08:00
parent aae26bf0dc
commit a99b8aaa33
3 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sw/source/ui/chrdlg/chardlg.cxx
View file

@ -209,18 +209,18 @@ SwCharURLPage::SwCharURLPage( Window* pParent,
TargetList* pList = new TargetList;
const SfxFrame& rFrame = pView->GetViewFrame()->GetTopFrame();
rFrame.GetTargetList(*pList);
USHORT nCount = (USHORT)pList->Count();
if( nCount )
if ( !pList->empty() )
{
USHORT i;
size_t nCount = pList->size();
size_t i;
for ( i = 0; i < nCount; i++ )
{
aTargetFrmLB.InsertEntry(*pList->GetObject(i));
aTargetFrmLB.InsertEntry( *pList->at( i ) );
}
for ( i = nCount; i; i-- )
for ( i = nCount; i; )
{
delete pList->GetObject( i - 1 );
delete pList->at( --i );
}
}
delete pList;

13
sw/source/ui/frmdlg/frmpage.cxx
View file

@ -2554,17 +2554,16 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet )
{
TargetList* pList = new TargetList;
((const SfxFrameItem*)pItem)->GetFrame()->GetTargetList(*pList);
USHORT nCount = (USHORT)pList->Count();
if( nCount )
if( !pList->empty() )
{
USHORT i;
for ( i = 0; i < nCount; i++ )
size_t nCount = pList->size();
for ( size_t i = 0; i < nCount; i++ )
{
aFrameCB.InsertEntry(*pList->GetObject(i));
aFrameCB.InsertEntry( *pList->at( i ) );
}
for ( i = nCount; i; i-- )
for ( size_t i = nCount; i; )
{
delete pList->GetObject( i - 1 );
delete pList->at( --i );
}
}
delete pList;

8
sw/source/ui/shells/basesh.cxx
View file

@ -181,12 +181,8 @@ void lcl_UpdateIMapDlg( SwWrtShell& rSh )
SvxIMapDlgChildWindow::UpdateIMapDlg(
aGrf, rURL.GetMap(), pList, pEditObj );
USHORT nCount = (USHORT)pList->Count();
if(nCount)
for( USHORT i = nCount; i; i-- )
{
delete pList->GetObject(i-1);
}
for ( size_t i = 0, n = pList->size(); i < n; ++i )
delete pList->at( i );
delete pList;
}