diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-21 15:25:35 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-21 15:52:46 +0400 |
| commit | 4802bf2da3439cfddde79a4193e642dac58eab9d (patch) | |
| tree | 17bdcd421fd5a528c81dc29b73c8cfae45af1729 /sd/source/ui/func/fusldlg.cxx | |
| parent | 64b315df9b7f90621db92062c6ce62f487325388 (diff) | |
String->OUString
Change-Id: Ifb3a2f8ef959baec38fe0168a9e88e85da0d9744
Diffstat (limited to 'sd/source/ui/func/fusldlg.cxx')
| -rw-r--r-- | sd/source/ui/func/fusldlg.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 93db40368f92..4ee6a2f9b809 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -62,7 +62,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) PresentationSettings& rPresentationSettings = mpDoc->getPresentationSettings(); SfxItemSet aDlgSet( mpDoc->GetPool(), ATTR_PRESENT_START, ATTR_PRESENT_END ); - std::vector<String> aPageNameList(mpDoc->GetSdPageCount( PK_STANDARD )); + std::vector<OUString> aPageNameList(mpDoc->GetSdPageCount( PK_STANDARD )); const String& rPresPage = rPresentationSettings.maPresPage; String aFirstPage; SdPage* pPage = NULL; @@ -71,12 +71,11 @@ void FuSlideShowDlg::DoExecute( SfxRequest& ) for( nPage = mpDoc->GetSdPageCount( PK_STANDARD ) - 1L; nPage >= 0L; nPage-- ) { pPage = mpDoc->GetSdPage( (sal_uInt16) nPage, PK_STANDARD ); - String aStr( pPage->GetName() ); + OUString aStr( pPage->GetName() ); - if ( !aStr.Len() ) + if ( aStr.isEmpty() ) { - aStr = String( SdResId( STR_PAGE ) ); - aStr.Append( OUString::valueOf( nPage + 1 ) ); + aStr = SD_RESSTR( STR_PAGE ) + OUString::number( nPage + 1 ); } aPageNameList[ nPage ] = aStr; |