convert DrawDocShell to OUString

Change-Id: I09e6f284024d00dbbc8a1c7b33684f4c23a650a8

3 files changed, 8 insertions, 8 deletions

diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index 9306d8f33438..193d4a317643 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -286,12 +286,12 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe
  */
 sal_Bool DrawDocShell::CheckPageName (::Window* pWin, OUString& rName )
 {
-    const String aStrForDlg( rName );
+    const OUString aStrForDlg( rName );
     bool bIsNameValid = IsNewPageNameValid( rName, true );
 
     if( ! bIsNameValid )
     {
-        String aDesc( SdResId( STR_WARN_PAGE_EXISTS ) );
+        OUString aDesc( SD_RESSTR( STR_WARN_PAGE_EXISTS ) );
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0;
         if( aNameDlg )
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 053b9a6ba898..5fa8a7669f28 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -652,7 +652,7 @@ SfxStyleSheetBasePool* DrawDocShell::GetStyleSheetPool()
     return( (SfxStyleSheetBasePool*) mpDoc->GetStyleSheetPool() );
 }
 
-sal_Bool DrawDocShell::GotoBookmark(const String& rBookmark)
+sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
 {
     sal_Bool bFound = sal_False;
 
@@ -846,7 +846,7 @@ sal_Bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
            masterpages about the name change.
         */
 
-        String aLayoutName;
+        OUString aLayoutName;
 
         SfxStringItem* pLayoutItem;
         if( rMedium.GetItemSet()->GetItemState(SID_TEMPLATE_NAME, sal_False, (const SfxPoolItem**) & pLayoutItem ) == SFX_ITEM_SET )
@@ -860,7 +860,7 @@ sal_Bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
             aLayoutName = aURL.getName();
         }
 
-        if( aLayoutName.Len() )
+        if (!aLayoutName.isEmpty())
         {
             sal_uInt32 nCount = mpDoc->GetMasterSdPageCount(PK_STANDARD);
             for (sal_uInt32 i = 0; i < nCount; ++i)
@@ -935,7 +935,7 @@ OutputDevice* DrawDocShell::GetDocumentRefDev (void)
 
 /** executes the SID_OPENDOC slot to let the framework open a document
     with the given URL and this document as a referer */
-void DrawDocShell::OpenBookmark( const String& rBookmarkURL )
+void DrawDocShell::OpenBookmark( const OUString& rBookmarkURL )
 {
     SfxStringItem   aStrItem( SID_FILE_NAME, rBookmarkURL );
     SfxStringItem   aReferer( SID_REFERER, GetMedium()->GetName() );
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 397fa88305b7..fa2f7675fa3f 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -127,7 +127,7 @@ public:
     void                    Disconnect(sd::ViewShell* pViewSh);
     void                    UpdateTablePointers();
 
-    sal_Bool                    GotoBookmark(const String& rBookmark);
+    sal_Bool                    GotoBookmark(const OUString& rBookmark);
 
     Bitmap                  GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixel);
 
@@ -156,7 +156,7 @@ public:
 
     /** executes the SID_OPENDOC slot to let the framework open a document
         with the given URL and this document as a referer */
-    void                    OpenBookmark( const String& rBookmarkURL );
+    void                    OpenBookmark( const OUString& rBookmarkURL );
 
     /** checks, if the given name is a valid new name for a slide