ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

5 files changed, 13 insertions, 18 deletions

diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 1afe4c2338ac..afe39ba1b966 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -198,15 +198,13 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
         PopupMenu* pHelpMenu = pMergeMenuBar->GetPopupMenu( SID_HELPMENU );
         if ( !pHelpMenu )
         {
-            sal_uInt16 nId = FindMenuId( pMergeMenuBar, String::CreateFromAscii( ".uno:HelpMenu" ));
+            sal_uInt16 nId = FindMenuId(pMergeMenuBar, rtl::OUString(".uno:HelpMenu"));
             if ( nId != USHRT_MAX )
                 pHelpMenu = pMergeMenuBar->GetPopupMenu( nId );
         }
 
         if ( pHelpMenu )
         {
-            static const char REFERENCECOMMAND_BEFORE[] = ".uno:About";
-
             // Add-Ons help menu items should be inserted after the "registration" menu item
             sal_uInt16 nItemCount       = pHelpMenu->GetItemCount();
             sal_uInt16 nInsSepAfterPos  = MENU_APPEND;
@@ -214,7 +212,7 @@ void AddonMenuManager::MergeAddonHelpMenu( const Reference< XFrame >& rFrame, Me
             AddonsOptions aOptions;
 
             // try to detect the about menu item with the command URL
-            sal_uInt16 nId = FindMenuId( pHelpMenu, String::CreateFromAscii( REFERENCECOMMAND_BEFORE ));
+            sal_uInt16 nId = FindMenuId(pHelpMenu, rtl::OUString(".uno:About"));
             sal_uInt16 nInsPos = pHelpMenu->GetItemPos( nId );
 
             Sequence< Sequence< PropertyValue > > aAddonSubMenu;
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 97e85190f30d..c91321bd2ad7 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -422,7 +422,7 @@ LicenseDialog::LicenseDialog(const ::rtl::OUString & aLicensePath, ResMgr *pResM
     aPBPageDown.SetStyle( aStyle );
 
     String aText = aInfo2FT.GetText();
-    aText.SearchAndReplaceAll( UniString::CreateFromAscii("%PAGEDOWN"), aPBPageDown.GetText() );
+    aText.SearchAndReplaceAll( rtl::OUString("%PAGEDOWN"), aPBPageDown.GetText() );
     aInfo2FT.SetText( aText );
 
     aPBDecline.SetText( aStrNotAccept );
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 9d105ca85ee2..c97cacd3d76b 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -88,7 +88,6 @@ const sal_Int16 MAX_IMAGETYPE_VALUE       = ::com::sun::star::ui::ImageType::SIZ
 
 static const char   IMAGE_FOLDER[]        = "images";
 static const char   BITMAPS_FOLDER[]      = "Bitmaps";
-static const char   IMAGE_EXTENSION[]     = ".png";
 
 static const char   ModuleImageList[]     = "private:resource/images/moduleimages";
 
@@ -227,7 +226,7 @@ void CmdImageList::impl_fillCommandToImageNameMap()
         }
 
         // We have to map commands which uses special characters like '/',':','?','\','<'.'>','|'
-        String aExt = String::CreateFromAscii( IMAGE_EXTENSION );
+        String aExt = rtl::OUString(".png");
         m_aImageCommandNameVector.resize(aCmdImageSeq.getLength() );
         m_aImageNameVector.resize( aCmdImageSeq.getLength() );
 
@@ -592,8 +591,8 @@ sal_Bool ImageManagerImpl::implts_storeUserImages(
                 pList->pImageItemList->push_back( pItem );
             }
 
-            pList->aURL = String::CreateFromAscii("Bitmaps/");
-            pList->aURL += String::CreateFromAscii( BITMAP_FILE_NAMES[nImageType] );
+            pList->aURL = rtl::OUString("Bitmaps/");
+            pList->aURL += rtl::OUString::createFromAscii(BITMAP_FILE_NAMES[nImageType]);
 
             uno::Reference< XTransactedObject > xTransaction;
             uno::Reference< XOutputStream >     xOutputStream;
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx
index 19676d3a2ca6..f750f96f275a 100644
--- a/framework/source/uielement/macrosmenucontroller.cxx
+++ b/framework/source/uielement/macrosmenucontroller.cxx
@@ -95,7 +95,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo
         return;
 
     // insert basic
-    String aCommand = String::CreateFromAscii( ".uno:MacroDialog" );
+    rtl::OUString aCommand(".uno:MacroDialog");
     String aDisplayName = RetrieveLabelFromCommand( aCommand );
     pPopupMenu->InsertItem( 2, aDisplayName );
     pPopupMenu->SetItemCommand( 2, aCommand );
@@ -174,10 +174,10 @@ String MacrosMenuController::RetrieveLabelFromCommand( const String& aCmdURL )
 
 void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 startItemId )
 {
-    const String aCmdBase = String::CreateFromAscii( ".uno:ScriptOrganizer?ScriptOrganizer.Language:string=" );
-    const String ellipsis = String::CreateFromAscii( "..." );
-    const ::rtl::OUString providerKey("com.sun.star.script.provider.ScriptProviderFor");
-    const ::rtl::OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider");
+    const rtl::OUString aCmdBase(".uno:ScriptOrganizer?ScriptOrganizer.Language:string=");
+    const rtl::OUString ellipsis( "..." );
+    const rtl::OUString providerKey("com.sun.star.script.provider.ScriptProviderFor");
+    const rtl::OUString languageProviderName("com.sun.star.script.provider.LanguageScriptProvider");
     sal_uInt16 itemId = startItemId;
     Reference< XContentEnumerationAccess > xEnumAccess = Reference< XContentEnumerationAccess >( m_xServiceManager, UNO_QUERY_THROW );
     Reference< XEnumeration > xEnum = xEnumAccess->createContentEnumeration ( languageProviderName );
@@ -200,7 +200,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, sal_uInt16 sta
                     ::rtl::OUString serviceName = serviceNames[ index ];
                     String aCommand =  aCmdBase;
                     String aDisplayName = String( serviceName.copy( providerKey.getLength() ) );
-                    if( aDisplayName.Equals( String::CreateFromAscii( "Java" ) ) || aDisplayName.Equals( String::CreateFromAscii( "Basic" ) ) )
+                    if( aDisplayName.Equals( rtl::OUString("Java") ) || aDisplayName.Equals( rtl::OUString("Basic") ) )
                     {
                         // no entries for Java & Basic added elsewhere
                         break;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index e075f0b2e8f0..62fbf53817ed 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -776,7 +776,6 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
 void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::CheckAndAddMenuExtension" );
-    static const char REFERENCECOMMAND_BEFORE[]         = ".uno:About";
 
     // retrieve menu extension item
     MenuExtensionItem aMenuItem( GetMenuExtension() );
@@ -787,7 +786,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
         sal_uInt16 nNewItemId( 0 );
         sal_uInt16 nInsertPos( MENU_APPEND );
         sal_uInt16 nBeforePos( MENU_APPEND );
-        String     aCommandBefore( String::CreateFromAscii ( REFERENCECOMMAND_BEFORE ));
+        String aCommandBefore( rtl::OUString(".uno:About"));
         for ( sal_uInt16 n = 0; n < pMenu->GetItemCount(); n++ )
         {
             sal_uInt16 nItemId = pMenu->GetItemId( n );
@@ -1932,7 +1931,6 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
 void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "MenuBarManager::GetPopupController" );
-    String aPopupScheme = String::CreateFromAscii( "vnd.sun.star.popup:" );
 
     SolarMutexGuard aSolarMutexGuard;