4 files changed, 13 insertions, 13 deletions

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 112c7da62abf..34b41bcb47d2 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -201,7 +201,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
         Transmitter::PRIORITY_LOW );
 }
 
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl );
+sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUrl );
 
 // Code copied from sdremote/source/presenter/PresenterNotesView.cxx
 OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
@@ -283,7 +283,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
         aRet.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
 }
 
-sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl )
+sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, OUString aUrl )
 {
     OUString aFilterName( "XHTML Draw File" );
     uno::Reference< document::XExporter > xExporter;
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index a1ddbedf83b1..dfe4b7c5b073 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -146,7 +146,7 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
             continue;
 
         // Use the name of the master page to avoid duplicate entries.
-        String sName (pMasterPage->GetName());
+        OUString sName (pMasterPage->GetName());
         if (aMasterPageNames.find(sName)!=aMasterPageNames.end())
             continue;
         aMasterPageNames.insert (sName);
@@ -159,9 +159,9 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList)
             SharedMasterPageDescriptor pDescriptor (new MasterPageDescriptor(
                 MasterPageContainer::MASTERPAGE,
                 nIndex,
-                String(),
+                OUString(),
                 pMasterPage->GetName(),
-                String(),
+                OUString(),
                 pMasterPage->IsPrecious(),
                 ::boost::shared_ptr<PageObjectProvider>(new ExistingPageProvider(pMasterPage)),
                 ::boost::shared_ptr<PreviewProvider>(new PagePreviewProvider())));
@@ -221,7 +221,7 @@ void CurrentMasterPagesSelector::UpdateSelection (void)
     sal_uInt16 nItemCount (PreviewValueSet::GetItemCount());
     for (nIndex=1; nIndex<=nItemCount && bLoop; nIndex++)
     {
-        String sName (PreviewValueSet::GetItemText (nIndex));
+        OUString sName (PreviewValueSet::GetItemText (nIndex));
         if (aNames.find(sName) != aNames.end())
         {
             PreviewValueSet::SelectItem (nIndex);
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index d386841c2431..5e3651e4c514 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -262,8 +262,8 @@ void DocumentHelper::ProvideStyles (
     SdPage* pPage)
 {
     // Get the layout name of the given page.
-    String sLayoutName (pPage->GetLayoutName());
-    sLayoutName.Erase (sLayoutName.SearchAscii (SD_LT_SEPARATOR));
+    OUString sLayoutName (pPage->GetLayoutName());
+    sLayoutName = sLayoutName.copy(0, sLayoutName.indexOf(SD_LT_SEPARATOR));
 
     // Copy the style sheet from source to target document.
     SdStyleSheetPool* pSourceStyleSheetPool =
@@ -306,8 +306,8 @@ void DocumentHelper::AssignMasterPageToPageList (
     // Make the layout name by stripping ouf the layout postfix from the
     // layout name of the given master page.
     OUString sFullLayoutName(pMasterPage->GetLayoutName());
-    String sBaseLayoutName (sFullLayoutName);
-    sBaseLayoutName.Erase (sBaseLayoutName.SearchAscii (SD_LT_SEPARATOR));
+    OUString sBaseLayoutName (sFullLayoutName);
+    sBaseLayoutName = sBaseLayoutName.copy(0, sBaseLayoutName.indexOf(SD_LT_SEPARATOR));
 
     if (rpPageList->empty())
         return;
@@ -329,7 +329,7 @@ void DocumentHelper::AssignMasterPageToPageList (
 
     ::svl::IUndoManager* pUndoMgr = rTargetDocument.GetDocSh()->GetUndoManager();
     if( pUndoMgr )
-        pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), String());
+        pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_SET_PRESLAYOUT), OUString());
 
     SdPage* pMasterPageInDocument = ProvideMasterPage(rTargetDocument,pMasterPage,rpPageList);
     if (pMasterPageInDocument == NULL)
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index bf392dbe3562..be13bda0fdeb 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -583,7 +583,7 @@ SfxRequest LayoutMenu::CreateRequest (
         SetOfByte aVisibleLayers (pPage->TRG_GetMasterPageVisibleLayers());
 
         aRequest.AppendItem(
-            SfxStringItem (ID_VAL_PAGENAME, String()));//pPage->GetName()));
+            SfxStringItem (ID_VAL_PAGENAME, OUString()));//pPage->GetName()));
         aRequest.AppendItem(SfxUInt32Item (ID_VAL_WHATLAYOUT, aLayout));
         aRequest.AppendItem(
             SfxBoolItem(ID_VAL_ISPAGEBACK, aVisibleLayers.IsSet(aBackground)));
@@ -654,7 +654,7 @@ void LayoutMenu::Fill (void)
             if (bRightToLeft && (WritingMode_TB_RL != pInfo->meWritingMode))
                 aBmp.Mirror (BMP_MIRROR_HORZ);
 
-            InsertItem (i, aBmp, String (SdResId (pInfo->mnStrResId)));
+            InsertItem (i, aBmp, SdResId (pInfo->mnStrResId));
             SetItemData (i, new AutoLayout(pInfo->maAutoLayout));
             n++;
         }