diff options
| author | Joseph Powers <jpowers27@cox.net> | 2011-01-01 10:57:36 -0800 |
|---|---|---|
| committer | Joseph Powers <jpowers27@cox.net> | 2011-01-01 10:57:36 -0800 |
| commit | 659475842406d948bb08a6af44a50b2af3e2b058 (patch) | |
| tree | 747a471449cc84e2e78ab19f9f45d4da6a5f9b51 | |
| parent | fc2990161c803ac82f15bb25ae6ab5e2c0d2302f (diff) | |
Remove DECLARE_LIST( TargetList, String* )
| -rw-r--r-- | cui/source/dialogs/cuiimapwnd.cxx | 8 | ||||
| -rw-r--r-- | cui/source/dialogs/hltpbase.cxx | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 5ce727d08..560deffc7 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> -#include <sfx2/sfxsids.hrc> +#include <sfx2/sfxsids.hrc> #define _ANIMATION #include "macroass.hxx" #include <svtools/imaprect.hxx> @@ -88,8 +88,8 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT maEdtDescription.SetText( rDescription ); maEdtName.SetText( rName ); - for( String* pStr = rTargetList.First(); pStr; pStr = rTargetList.Next() ) - maCbbTargets.InsertEntry( *pStr ); + for( size_t i = 0, n = rTargetList.size(); i < n; ++i ) + maCbbTargets.InsertEntry( *rTargetList[ i ] ); if( !rTarget.Len() ) maCbbTargets.SetText( String::CreateFromAscii( "_self" ) ); diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 202da71e2..e52a8f0a4 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -67,17 +67,17 @@ SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId, if ( pFrame ) { pFrame->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++ ) { - InsertEntry(*pList->GetObject(i)); + InsertEntry( *pList->at( i ) ); } - for ( i = nCount; i; i-- ) + for ( i = nCount; i; ) { - delete pList->GetObject( i - 1 ); + delete pList->at( --i ); } } delete pList; |