diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-16 20:35:59 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-16 21:39:12 +0400 |
| commit | da5eb782cb28f806a8ca08ef8ebf21772363307d (patch) | |
| tree | e493bed69b460f3728b58f4dc3ff65b9c14f59d1 /sd/source/ui/controller | |
| parent | fc395e6b312f80976b25a25990791e7fa3d2aa39 (diff) | |
String->OUString
Change-Id: Ibb7483e12d1c14b01cbcff64f881eb88e6c48265
Diffstat (limited to 'sd/source/ui/controller')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index a2e83d387261..38626bbce054 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -148,7 +148,7 @@ static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo ) Size aLayoutItemSize; for( ; pInfo->mnBmpResId; pInfo++ ) { - String aText( SdResId( pInfo->mnStrResId ) ); + OUString aText( SD_RESSTR( pInfo->mnStrResId ) ); BitmapEx aBmp( SdResId( pInfo->mnBmpResId ) ); pValue->InsertItem( static_cast<sal_uInt16>(pInfo->maAutoLayout)+1, aBmp, aText ); @@ -187,8 +187,8 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const const sal_Int32 LAYOUT_BORDER_PIX = 7; - String aTitle1( SdResId( STR_GLUE_ESCDIR_HORZ ) ); - String aTitle2( SdResId( STR_GLUE_ESCDIR_VERT ) ); + OUString aTitle1( SD_RESSTR( STR_GLUE_ESCDIR_HORZ ) ); + OUString aTitle2( SD_RESSTR( STR_GLUE_ESCDIR_VERT ) ); SvtLanguageOptions aLanguageOptions; const bool bVerticalEnabled = aLanguageOptions.IsVerticalTextEnabled(); @@ -255,11 +255,11 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const sSlotStr = ".uno:Undo"; aSlotImage = ::GetImage( mxFrame, sSlotStr, sal_False ); - String sSlotTitle; + OUString sSlotTitle; if( bInsertPage ) sSlotTitle = ImplRetrieveLabelFromCommand( mxFrame, sSlotStr ); else - sSlotTitle = String( SdResId( STR_RESET_LAYOUT ) ); + sSlotTitle = SD_RESSTR( STR_RESET_LAYOUT ); appendEntry( 2, sSlotTitle, aSlotImage); } } |