diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-27 10:07:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:07 +0200 |
| commit | b4824c891590ba78d084f155457d1246abfc638c (patch) | |
| tree | 443dcde3bf95837bcf7228282b26b5cb5f1ed550 /sw/source/ui | |
| parent | aca6fd651270227b44e3e67d6517b79bafb6229b (diff) | |
convert includes/sfx2/frame.hxx from String to OUString
Change-Id: Ia69548250beb2896cab8c19fe2e635fdc9162f4d
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/chrdlg/chardlg.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 5fccdce8c52a..fea0de728ba0 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -177,15 +177,10 @@ SwCharURLPage::SwCharURLPage(Window* pParent, const SfxItemSet& rCoreSet) if ( !pList->empty() ) { size_t nCount = pList->size(); - size_t i; - for ( i = 0; i < nCount; i++ ) + for ( size_t i = 0; i < nCount; i++ ) { - m_pTargetFrmLB->InsertEntry( *pList->at( i ) ); - } - for ( i = nCount; i; ) - { - delete pList->at( --i ); + m_pTargetFrmLB->InsertEntry( pList->at( i ) ); } } delete pList; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 02a14cd47504..cae822c4ac83 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2709,11 +2709,7 @@ void SwFrmURLPage::Reset( const SfxItemSet &rSet ) size_t nCount = pList->size(); for ( size_t i = 0; i < nCount; i++ ) { - pFrameCB->InsertEntry( *pList->at( i ) ); - } - for ( size_t i = nCount; i; ) - { - delete pList->at( --i ); + pFrameCB->InsertEntry( pList->at( i ) ); } } delete pList; diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 9e67bc1fb4d2..e8764a8e7afc 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -166,8 +166,6 @@ static void lcl_UpdateIMapDlg( SwWrtShell& rSh ) SvxIMapDlgChildWindow::UpdateIMapDlg( aGrf, rURL.GetMap(), pList, pEditObj ); - for ( size_t i = 0, n = pList->size(); i < n; ++i ) - delete pList->at( i ); delete pList; } |