diff options
| author | MÁTÉ Gergely <sportember@caesar.elte.hu> | 2013-07-27 00:53:45 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-07-28 21:20:10 +0000 |
| commit | af079c886f9643d539a16065dc4e96d70fac422b (patch) | |
| tree | fa20253acd70b79b5ed3a9992039eef56e00dd4b /sd/source/ui/view | |
| parent | ad94820ed7bdfb9353d02345e70e02cf2c518893 (diff) | |
Converting to OUString in sd in sdundo.hxx and related files.
Change-Id: I5e9c1122ccfe9dfadfb36c4ab419c429c2bda6d0
Reviewed-on: https://gerrit.libreoffice.org/5135
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/ViewShellImplementation.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews3.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/viewshe2.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 07048c05f2c3..1feabbc4101c 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -195,14 +195,14 @@ void ViewShell::Implementation::ProcessModifyPageSlot ( if( pUndoManager ) { - String aComment( SdResId(STR_UNDO_MODIFY_PAGE) ); + OUString aComment( SdResId(STR_UNDO_MODIFY_PAGE) ); pUndoManager->EnterListAction(aComment, aComment); ModifyPageUndoAction* pAction = new ModifyPageUndoAction( pDocument, pUndoPage, aNewName, aNewAutoLayout, bBVisible, bBObjsVisible); pUndoManager->AddUndoAction(pAction); - // Clear the selection because the selectec object may be removed as - // a result of the ssignment of the layout. + // Clear the selection because the selected object may be removed as + // a result of the assignment of the layout. mrViewShell.GetDrawView()->UnmarkAll(); if (!bHandoutMode) diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 04bd60741427..29364d25990a 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -482,7 +482,7 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) rReq.GetSlot() == SID_ATTR_LONG_ULSPACE ) { pUndoGroup = new SdUndoGroup(GetDoc()); - String aString(SdResId(STR_UNDO_CHANGE_PAGEBORDER)); + OUString aString(SdResId(STR_UNDO_CHANGE_PAGEBORDER)); pUndoGroup->SetComment(aString); } diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index fa14fe1d896b..7fd7d8f55c04 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -811,7 +811,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar pAction->SetSecondSoundOn(pInfo->mbSecondSoundOn, pInfo->mbSecondSoundOn); pAction->SetSecondPlayFull(pInfo->mbSecondPlayFull, pInfo->mbSecondPlayFull); - String aString(SdResId(STR_UNDO_ANIMATION)); + OUString aString(SdResId(STR_UNDO_ANIMATION)); pAction->SetComment(aString); mpDocSh->GetUndoManager()->AddUndoAction(pAction); pInfo->meClickAction = eClickAction; diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index f6586051c4fb..8f7a4b7dee64 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -469,7 +469,7 @@ void ViewShell::SetPageSizeAndBorder(PageKind ePageKind, const Size& rNewSize, SdPage* pPage = 0; SdUndoGroup* pUndoGroup = NULL; pUndoGroup = new SdUndoGroup(GetDoc()); - String aString(SdResId(STR_UNDO_CHANGE_PAGEFORMAT)); + OUString aString(SdResId(STR_UNDO_CHANGE_PAGEFORMAT)); pUndoGroup->SetComment(aString); SfxViewShell* pViewShell = GetViewShell(); OSL_ASSERT (pViewShell!=NULL); |