ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

10 files changed, 19 insertions, 19 deletions

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 898305c6fed0..1c7154f19282 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -217,8 +217,8 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
     }
     else if ( maBookmarkFile != aBookmarkName && aBookmarkName.Len() )
     {
-        sal_Bool bCreateGraphicShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" );
-        sal_Bool bCreateImpressShell = pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" );
+        sal_Bool bCreateGraphicShell = pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument";
+        sal_Bool bCreateImpressShell = pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument";
         if ( bCreateGraphicShell || bCreateImpressShell )
         {
             CloseBookmarkDoc();
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index cb41669f0781..53c9bbc1812e 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1874,7 +1874,7 @@ IMPL_LINK_NOARG(AssistentDlg, FinishHdl)
         {
             sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0,
-                ::String::CreateFromAscii("simpress") );
+                rtl::OUString("simpress") );
 
             if ( aFileDlg.Execute() == ERRCODE_NONE )
                 aFileToOpen = aFileDlg.GetPath();
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 7a06ae4a3c56..fd235bb5fb9f 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -609,7 +609,7 @@ sal_Bool SdNavigatorWin::InsertFile(const String& rFileName)
         if (aFileName != maDropFileName)
         {
             SfxMedium aMed(aFileName, (STREAM_READ | STREAM_SHARE_DENYNONE));
-            SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") );
+            SfxFilterMatcher aMatch( rtl::OUString("simpress") );
             aMed.UseInteractionHandler( sal_True );
             nErr = aMatch.GuessFilter(aMed, &pFilter);
         }
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index b6e4ba82e046..a7a7197dbda2 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -405,7 +405,7 @@ bool DrawDocShell::IsNewPageNameValid( String & rInOutPageName, bool bResetStrin
         else
         {
             // check for upper/lower case roman numbering
-            String sReserved( String::CreateFromAscii( "cdilmvx" ) );
+            String sReserved( rtl::OUString("cdilmvx") );
 
             // gobble up all following characters contained in one reserved class
             String sRemainder = rInOutPageName.GetToken( 1, sal_Unicode(' ') );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 1462fad7aee1..7142f1aaa8d4 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -279,8 +279,8 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
 
         if( pMedium->IsStorage() || ( pMedium->GetInStream() && SotStorage::IsStorageFile( pMedium->GetInStream() ) ) )
         {
-            if ( pFilter->GetServiceName().EqualsAscii( "com.sun.star.presentation.PresentationDocument" ) ||
-                 pFilter->GetServiceName().EqualsAscii( "com.sun.star.drawing.DrawingDocument" ) )
+            if ( pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument" ||
+                 pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument" )
             {
                 // Draw, Impress or PowerPoint document
                 // the ownership of the Medium is transferred
diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
index cc642dc69ad7..36e0f4a29434 100644
--- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx
@@ -254,7 +254,7 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript
             Any aPage;
             aPage <<= rpDescriptor->GetPage()->getUnoPage();
             xSet->setPropertyValue (
-                String::CreateFromAscii("CurrentPage"),
+                rtl::OUString("CurrentPage"),
                 aPage);
         }
     }
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index 8c518576d224..7fa6e94172d2 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -233,7 +233,7 @@ void Listener::ConnectToController (void)
         {
             try
             {
-                xSet->addPropertyChangeListener(String::CreateFromAscii("CurrentPage"), this);
+                xSet->addPropertyChangeListener(rtl::OUString("CurrentPage"), this);
             }
             catch (beans::UnknownPropertyException&)
             {
@@ -241,7 +241,7 @@ void Listener::ConnectToController (void)
             }
             try
             {
-                xSet->addPropertyChangeListener(String::CreateFromAscii("IsMasterPageMode"), this);
+                xSet->addPropertyChangeListener(rtl::OUString("IsMasterPageMode"), this);
             }
             catch (beans::UnknownPropertyException&)
             {
@@ -277,10 +277,10 @@ void Listener::DisconnectFromController (void)
             if (xSet.is())
             {
                 xSet->removePropertyChangeListener (
-                    String::CreateFromAscii("CurrentPage"),
+                    rtl::OUString("CurrentPage"),
                     this);
                 xSet->removePropertyChangeListener (
-                    String::CreateFromAscii("IsMasterPageMode"),
+                    rtl::OUString("IsMasterPageMode"),
                     this);
             }
 
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index 4c6ff762a8c7..5b1b671f57eb 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -253,16 +253,16 @@ Size PageObjectLayouter::GetPageNumberAreaSize (const int nPageCount)
 
     String sPageNumberTemplate;
     if (nPageCount < 10)
-        sPageNumberTemplate = String::CreateFromAscii("9");
+        sPageNumberTemplate = rtl::OUString("9");
     else if (nPageCount < 100)
-        sPageNumberTemplate = String::CreateFromAscii("99");
+        sPageNumberTemplate = rtl::OUString("99");
     else if (nPageCount < 200)
         // Just for the case that 1 is narrower than 9.
-        sPageNumberTemplate = String::CreateFromAscii("199");
+        sPageNumberTemplate = rtl::OUString("199");
     else if (nPageCount < 1000)
-        sPageNumberTemplate = String::CreateFromAscii("999");
+        sPageNumberTemplate = rtl::OUString("999");
     else
-        sPageNumberTemplate = String::CreateFromAscii("9999");
+        sPageNumberTemplate = rtl::OUString("9999");
     // More then 9999 pages are not handled.
 
     const Size aSize (
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
index 34eccd6d84ce..41c591d4e666 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.cxx
@@ -72,7 +72,7 @@ Image PagePreviewProvider::operator () (
         aPreview = rRenderer.RenderPage(
             pPage,
             nWidth,
-            String::CreateFromAscii(""),
+            rtl::OUString(),
             false);
     }
 
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5c2c43a7052d..aa7cbbc5ef6a 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1603,7 +1603,7 @@ void CurrentPageSetter::operator() (bool)
             // Switch to the page last edited by setting the CurrentPage
             // property.
             Reference<beans::XPropertySet> xSet (mrBase.GetController(), UNO_QUERY_THROW);
-            xSet->setPropertyValue (String::CreateFromAscii("CurrentPage"), aPage);
+            xSet->setPropertyValue (rtl::OUString("CurrentPage"), aPage);
         }
         catch (const RuntimeException&)
         {