probably the last uses of the one argument String::CreateFromAscii variant

Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c

4 files changed, 13 insertions, 14 deletions

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 8511f002fc1f..5f5d5cc25c04 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2560,8 +2560,8 @@ const String& SdPage::GetName() const
     }
     else if (mePageKind == PK_HANDOUT && mbMaster)
     {
-        aCreatedPageName += String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ));
-        aCreatedPageName += String(SdResId(STR_HANDOUT));
+        aCreatedPageName += rtl::OUString(" (");
+        aCreatedPageName += SdResId(STR_HANDOUT).toString();
         aCreatedPageName += sal_Unicode( ')' );
     }
 
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index b84c591aa9a9..c8e91959ba27 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -390,7 +390,7 @@ void FuConstruct::SetStyleSheet( SfxItemSet& rAttr, SdrObject* pObj,
         * Objects was created on the slide master page
         ***********************************************/
         String aName( pPage->GetLayoutName() );
-        String aSep = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ) );
+        String aSep = rtl::OUString(SD_LT_SEPARATOR);
         sal_uInt16 n = aName.Search(aSep);
         n = n + aSep.Len();
         aName.Erase(n);
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 7f51e8e38cac..1462fad7aee1 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -147,7 +147,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
                 String  aExt;
                 String  aAllSpec( SdResId( STR_ALL_FILES ) );
 
-                xFilterManager->appendFilter( aAllSpec, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.*" ) ) );
+                xFilterManager->appendFilter( aAllSpec, rtl::OUString("*.*") );
                 xFilterManager->setCurrentFilter( aAllSpec ); // set default-filter (<All>)
 
                 // Get main filter
@@ -173,7 +173,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
                     xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
 
                 // get Powerpoint filter
-                aExt = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( ".ppt" ) );
+                aExt = rtl::OUString(".ppt");
                 pFilter = aMatch.GetFilter4Extension( aExt );
                 if( pFilter )
                     xFilterManager->appendFilter( pFilter->GetUIName(), pFilter->GetDefaultExtension() );
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index ba0fd114ec21..8b2032d204a5 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -177,13 +177,13 @@ SdFilterDetect::~SdFilterDetect()
 
     const SfxFilter* pFilter = 0;
     String aFilterName;
-    String aPrefix = String::CreateFromAscii( "private:factory/" );
+    String aPrefix = rtl::OUString("private:factory/");
     if( aURL.Match( aPrefix ) == aPrefix.Len() )
     {
         if( SvtModuleOptions().IsImpress() )
         {
             String aPattern( aPrefix );
-            aPattern += String::CreateFromAscii("simpress");
+            aPattern += rtl::OUString("simpress");
             if ( aURL.Match( aPattern ) >= aPattern.Len() )
                 pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
         }
@@ -191,7 +191,7 @@ SdFilterDetect::~SdFilterDetect()
         if( !pFilter && SvtModuleOptions().IsDraw() )
         {
             String aPattern( aPrefix );
-            aPattern += String::CreateFromAscii("sdraw");
+            aPattern += rtl::OUString("sdraw");
             if ( aURL.Match( aPattern ) >= aPattern.Len() )
                 pFilter = SfxFilter::GetDefaultFilterFromFactory( aURL );
         }
@@ -317,9 +317,9 @@ SdFilterDetect::~SdFilterDetect()
                             //TODO/LATER: using this method impress is always preferred if no flat detecion has been made
                             // this should been discussed!
                             if ( SvtModuleOptions().IsImpress() )
-                                pFilter = SfxFilterMatcher( String::CreateFromAscii("simpress") ).GetFilter4EA( aTypeName );
+                                pFilter = SfxFilterMatcher( rtl::OUString("simpress") ).GetFilter4EA( aTypeName );
                             else if ( SvtModuleOptions().IsDraw() )
-                                pFilter = SfxFilterMatcher( String::CreateFromAscii("sdraw") ).GetFilter4EA( aTypeName );
+                                pFilter = SfxFilterMatcher( rtl::OUString("sdraw") ).GetFilter4EA( aTypeName );
                         }
                     }
                 }
@@ -369,9 +369,8 @@ SdFilterDetect::~SdFilterDetect()
                                         *pStm >> n8;
                                         if ( ( n8 & 0xf0 ) == 0 )       // we are supporting binary cgm format only, so
                                         {                               // this is a small test to exclude cgm text
-                                            const String aName = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "CGM - Computer Graphics Metafile" ) );
-                                            SfxFilterMatcher aMatch( String::CreateFromAscii("simpress") );
-                                            pFilter = aMatch.GetFilter4FilterName( aName );
+                                            SfxFilterMatcher aMatch(rtl::OUString("simpress"));
+                                            pFilter = aMatch.GetFilter4FilterName(rtl::OUString("CGM - Computer Graphics Metafile"));
                                         }
                                     }
                                 }
@@ -394,7 +393,7 @@ SdFilterDetect::~SdFilterDetect()
                                     aFilterConfigItem.WriteInt32( "Resolution" , nBase );
                                 }
 
-                                SfxFilterMatcher aMatch( String::CreateFromAscii("sdraw") );
+                                SfxFilterMatcher aMatch(rtl::OUString("sdraw"));
                                 pFilter = aMatch.GetFilter4FilterName( aName );
                             }
                         }