convert more .cxx files in sd from String to OUString

Change-Id: I03d86a02021df0205cc3505ea9f99d1d18735abc

3 files changed, 12 insertions, 14 deletions

diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index a495bed4119d..4fece11c240c 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -506,7 +506,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
     const Size      aOutSize( GetOutputSize() );
     const Size      aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) );
     const Size      aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) );
-    String          aText( SdResId( STR_PRES_PAUSE ) );
+    OUString        aText( SdResId( STR_PRES_PAUSE ) );
     bool            bDrawn = false;
 
     Font            aFont( GetSettings().GetStyleSettings().GetMenuFont() );
@@ -555,9 +555,9 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
             SvtSysLocale                aSysLocale;
             const LocaleDataWrapper&    aLocaleData = aSysLocale.GetLocaleData();
 
-            aText.AppendAscii( " ( " );
+            aText += " ( ";
             aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) );
-            aText.AppendAscii( " )" );
+            aText += " )";
             aVDev.DrawText( Point( aOffset.Width(), 0 ), aText );
             DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, Point(), aVDevSize, aVDev );
             bDrawn = true;
@@ -581,7 +581,7 @@ void ShowWindow::DrawEndScene()
 
     const Point     aOutOrg( PixelToLogic( Point() ) );
     const Size      aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) );
-    const String    aText( SdResId( STR_PRES_SOFTEND ) );
+    const OUString  aText( SdResId( STR_PRES_SOFTEND ) );
 
     aFont.SetSize( aTextSize );
     aFont.SetColor( COL_WHITE );
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 9abf0aa96ac5..2d50fc3ebf4f 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -373,7 +373,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
         {
             bIllegalArgument = false;
 
-            const String aShowName( aShow );
+            const OUString aShowName( aShow );
 
             SdCustomShowList* pCustomShowList = mpDoc->GetCustomShowList(sal_False);
             if(pCustomShowList)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 5f47c708baa6..afc85dcbf749 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -914,7 +914,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
 
         // ---
 
-        String  aPresSlide( maPresSettings.maPresPage );
+        OUString  aPresSlide( maPresSettings.maPresPage );
         SdPage* pStartPage = mpViewShell ? mpViewShell->GetActualPage() : 0;
         bool    bStartWithActualSlide =  pStartPage &&
                                         ( (meAnimationMode != ANIMATIONMODE_SHOW) ||
@@ -945,7 +945,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
 
         if( bStartWithActualSlide )
         {
-            if ( !aPresSlide.Len())
+            if ( aPresSlide.isEmpty())
             {
                 // no preset slide yet, so pick current on one
                 aPresSlide = pStartPage->GetName();
@@ -1609,7 +1609,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
 
     case presentation::ClickAction_MACRO:
     {
-        const String aMacro( pEvent->maStrBookmark );
+        const OUString aMacro( pEvent->maStrBookmark );
 
         if ( SfxApplication::IsXScriptURL( aMacro ) )
         {
@@ -1624,14 +1624,12 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
             // aMacro has the following syntax:
             // "Macroname.Modulname.Libname.Documentname" or
             // "Macroname.Modulname.Libname.Applicationname"
-            String aMacroName = aMacro.GetToken(0, sal_Unicode('.'));
-            String aModulName = aMacro.GetToken(1, sal_Unicode('.'));
+            OUString aMacroName = aMacro.getToken(0, '.');
+            OUString aModulName = aMacro.getToken(1, '.');
 
             // todo: is the limitation still given that only
             // Modulname+Macroname can be used here?
-            String aExecMacro(aModulName);
-            aExecMacro.Append( sal_Unicode('.') );
-            aExecMacro.Append( aMacroName );
+            OUString aExecMacro = aModulName + "." + aMacroName;
             mpDocSh->GetBasic()->Call(aExecMacro);
         }
     }
@@ -2814,7 +2812,7 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq)
 
         case SID_NAVIGATOR_OBJECT:
         {
-            const String aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() );
+            const OUString aTarget( ((SfxStringItem&) pArgs->Get(SID_NAVIGATOR_OBJECT)).GetValue() );
 
             // is the bookmark a Slide?
             sal_Bool        bIsMasterPage;