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>

10 files changed, 12 insertions, 12 deletions

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index eb638b7f50d1..0f8e7dee58dd 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -264,7 +264,7 @@ void lcl_CreateUndoForPages(
     SdDrawDocument* pDoc            = pDocSh->GetDoc();
     if( pManager && pDocSh && pDoc )
     {
-        String aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
+        OUString aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
         pManager->EnterListAction(aComment, aComment);
         SdUndoGroup* pUndoGroup = new SdUndoGroup( pDoc );
         pUndoGroup->SetComment( aComment );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 6e5b5af9e5f4..518dd26d5932 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -325,7 +325,7 @@ void HeaderFooterDialog::Cancel( TabPage* )
 void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
 {
     SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
-    String aComment( GetText() );
+    OUString aComment( GetText() );
     pUndoGroup->SetComment( aComment );
 
     HeaderFooterSettings aNewSettings;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 3efc8aecf4eb..ae0f6c5c1a90 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -619,7 +619,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest& rReq )
         nSecondPlayFullSet == ATTR_SET)
     {
         // String for undo-group and list-action
-        String aComment(SdResId(STR_UNDO_ANIMATION));
+        OUString aComment(SdResId(STR_UNDO_ANIMATION));
 
         // with 'following curves', we have an additional UndoAction
         // therefore cling? here
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index ae49182c2205..abae1282329a 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -390,7 +390,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
             }
             else if( bSetToAllPages )
             {
-                String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
+                OUString aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
                 ::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
                 pUndoMgr->EnterListAction(aComment, aComment);
                 SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index 255ec111be70..8b821cbe8780 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -36,7 +36,7 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
     mrPage(rPage),
     mpItemSet(new SfxItemSet(rItenSet))
 {
-    String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
+    OUString aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
     SetComment( aString );
 }
 
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index 11bae9c043cf..52868cccb6de 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -47,7 +47,7 @@ SdLayerModifyUndoAction::SdLayerModifyUndoAction(
     mbNewIsLocked( bNewIsLocked ),
     mbNewIsPrintable( bNewIsPrintable )
 {
-    String aString(SdResId(STR_MODIFYLAYER));
+    OUString aString(SdResId(STR_MODIFYLAYER));
     SetComment(aString);
 }
 
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);