diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-10 16:30:45 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-08-10 16:32:46 +0400 |
| commit | e1b8dfda24c75e91d8ebced7a4022b78ee7fca25 (patch) | |
| tree | 81919db3ec72d41178bdcb51549c868502219dfe /sd/source/ui/view/viewshe3.cxx | |
| parent | f115934e0a9146c0adf115abcb99e048c530349d (diff) | |
String->OUString
Change-Id: Ifda8c7453ecb40abdae8d63656b8742c80691b98
Diffstat (limited to 'sd/source/ui/view/viewshe3.cxx')
| -rw-r--r-- | sd/source/ui/view/viewshe3.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 54d5fcaf5871..643550c5d464 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -143,7 +143,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff. - String aTmp( SvtResId( STR_UNDO ) ); + OUString aTmp(SVT_RESSTR(STR_UNDO)); aTmp += pUndoManager->GetUndoActionComment(0); rSet.Put(SfxStringItem(SID_UNDO, aTmp)); } @@ -170,7 +170,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet ) { // Set the necessary string like in // sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff. - String aTmp(SvtResId(STR_REDO)); + OUString aTmp(SVT_RESSTR(STR_REDO)); aTmp += pUndoManager->GetRedoActionComment(0); rSet.Put(SfxStringItem(SID_REDO, aTmp)); } @@ -198,8 +198,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( sal_uInt16 nSId = rRequest.GetSlot(); SdDrawDocument* pDocument = GetDoc(); SdrLayerAdmin& rLayerAdmin = pDocument->GetLayerAdmin(); - sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRND)), sal_False); - sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(String(SdResId(STR_LAYER_BCKGRNDOBJ)), sal_False); + sal_uInt8 aBckgrnd = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRND), sal_False); + sal_uInt8 aBckgrndObj = rLayerAdmin.GetLayerID(SD_RESSTR(STR_LAYER_BCKGRNDOBJ), sal_False); SetOfByte aVisibleLayers; // Determine the page from which to copy some values, such as layers, // size, master page, to the new page. This is usually the given page. @@ -212,8 +212,8 @@ SdPage* ViewShell::CreateOrDuplicatePage ( else aVisibleLayers.SetAll(); - String aStandardPageName; - String aNotesPageName; + OUString aStandardPageName; + OUString aNotesPageName; AutoLayout eStandardLayout (AUTOLAYOUT_NONE); AutoLayout eNotesLayout (AUTOLAYOUT_NOTES); sal_Bool bIsPageBack = aVisibleLayers.IsSet(aBckgrnd); @@ -310,7 +310,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( View* pDrView = GetView(); const bool bUndo = pDrView && pDrView->IsUndoEnabled(); if( bUndo ) - pDrView->BegUndo( String( SdResId(STR_INSERTPAGE) ) ); + pDrView->BegUndo(SD_RESSTR(STR_INSERTPAGE)); sal_uInt16 nNewPageIndex = 0xffff; switch (nSId) |