ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

4 files changed, 11 insertions, 13 deletions

diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 471becda482e..ac384bb86d3e 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -324,15 +324,15 @@ namespace
             aName += pMethod->GetName();
 
             // language
-            String aLanguage = String::CreateFromAscii("Basic");
+            rtl::OUString aLanguage("Basic");
 
             // location
-            String aLocation;
+            rtl::OUString aLocation;
             ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
             if ( aDocument.isDocument() )
             {
                 // document basic
-                aLocation = String::CreateFromAscii("document");
+                aLocation = rtl::OUString("document");
 
                 if ( rxLimitToDocument.is() )
                 {
@@ -366,17 +366,17 @@ namespace
             else
             {
                 // application basic
-                aLocation = String::CreateFromAscii("application");
+                aLocation = rtl::OUString("application");
             }
 
             // script URL
             if ( !bError )
             {
-                aScriptURL = String::CreateFromAscii("vnd.sun.star.script:");
+                aScriptURL = rtl::OUString("vnd.sun.star.script:");
                 aScriptURL += aName;
-                aScriptURL += String::CreateFromAscii("?language=");
+                aScriptURL += rtl::OUString("?language=");
                 aScriptURL += aLanguage;
-                aScriptURL += String::CreateFromAscii("&location=");
+                aScriptURL += rtl::OUString("&location=");
                 aScriptURL += aLocation;
             }
 
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 9018f3add5db..d46c797a79c7 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -135,7 +135,7 @@ BasicIDEDLL::BasicIDEDLL()
     SfxModule* pMod = BASIC_MOD();
 
     SfxObjectFactory& rFactory = BasicDocShell::Factory();
-    rFactory.SetDocumentServiceName( String::CreateFromAscii( "com.sun.star.script.BasicIDE" ) );
+    rFactory.SetDocumentServiceName( rtl::OUString("com.sun.star.script.BasicIDE") );
 
     BasicDocShell::RegisterInterface( pMod );
     BasicIDEShell::RegisterFactory( SVX_INTERFACE_BASIDE_VIEWSH );
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 761be97b03c0..bd0f6fe70fcc 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -354,7 +354,7 @@ SbMethod* MacroChooser::CreateMacro()
     String aLibName( aDesc.GetLibName() );
 
     if ( !aLibName.Len() )
-        aLibName = String::CreateFromAscii( "Standard" );
+        aLibName = rtl::OUString("Standard");
 
     aDocument.getOrCreateLibrary( E_SCRIPTS, aLibName );
 
@@ -522,8 +522,6 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
 
 IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
 {
-    static String aSpaceStr = String::CreateFromAscii(" ");
-
     // Is also called if deselected!
     // Two function calls in every SelectHdl because
     // there's no separate DeselectHDL.
@@ -537,7 +535,7 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
     if ( pModule )
     {
         String aStr = aMacrosInTxtBaseStr;
-        aStr += aSpaceStr;
+        aStr += rtl::OUString(" ");
         aStr += pModule->GetName();
 
         aMacrosInTxt.SetText( aStr );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index bf7d036b25e2..6c9aacd63524 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -1532,7 +1532,7 @@ void LibPage::SetCurLib()
                     ImpInsertLibEntry( aLibName, i );
             }
 
-            SvLBoxEntry* pEntry_ = aLibBox.FindEntry( String::CreateFromAscii( "Standard" ) );
+            SvLBoxEntry* pEntry_ = aLibBox.FindEntry( rtl::OUString("Standard") );
             if ( !pEntry_ )
                 pEntry_ = aLibBox.GetEntry( 0 );
             aLibBox.SetCurEntry( pEntry_ );