reduce scope and replace some String::CreateFromAscii

Change-Id: I8c375e3bfbcd3d7046a8bdb1968934b7d7ca96f8

3 files changed, 9 insertions, 10 deletions

diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 9184f57d92e3..73ca33ec1f5f 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -240,7 +240,7 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
         {
             sal_Bool bSysTopic;
             {
-                DdeConnection aTmp( sServer, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "SYSTEM" ) ) );
+                DdeConnection aTmp(sServer, rtl::OUString("SYSTEM"));
                 bSysTopic = !aTmp.GetError();
             }
 
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index b397b3b2b3a8..9ee75174a338 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -547,8 +547,7 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId()
     if( !nFormat )
     {
         nFormat = SotExchange::RegisterFormatName(
-                    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
-                                "StatusInfo from SvxInternalLink" )));
+                    rtl::OUString("StatusInfo from SvxInternalLink"));
     }
     return nFormat;
 }
@@ -704,7 +703,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
             SfxStringItem aName( SID_FILE_NAME, sTopic );
             SfxBoolItem aMinimized(SID_MINIMIZED, sal_True);
             SfxBoolItem aHidden(SID_HIDDEN, sal_True);
-            SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") );
+            SfxStringItem aTarget( SID_TARGETNAME, rtl::OUString("_blank") );
             SfxStringItem aReferer( SID_REFERER, sReferer );
             SfxUInt16Item aUpdate( SID_UPDATEDOCMODE, nUpdateMode );
             SfxBoolItem aReadOnly(SID_DOC_READONLY, false);
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 197fc9838eba..e428190c1a11 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -136,26 +136,26 @@ const SfxFilter* SfxFilter::GetFilterByName( const String& rName )
 String SfxFilter::GetTypeFromStorage( const SotStorage& rStg )
 {
     const char* pType=0;
-    if ( rStg.IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "WordDocument" ) ) ) )
+    if ( rStg.IsStream( rtl::OUString("WordDocument") ) )
     {
-        if ( rStg.IsStream( String::CreateFromAscii("0Table" ) ) || rStg.IsStream( String::CreateFromAscii("1Table" ) ) )
+        if ( rStg.IsStream( rtl::OUString("0Table") ) || rStg.IsStream( rtl::OUString("1Table") ) )
             pType = "writer_MS_Word_97";
         else
             pType = "writer_MS_Word_95";
     }
-    else if ( rStg.IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Book" ) ) ) )
+    else if ( rStg.IsStream( rtl::OUString("Book") ) )
     {
         pType = "calc_MS_Excel_95";
     }
-    else if ( rStg.IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Workbook" ) ) ) )
+    else if ( rStg.IsStream( rtl::OUString("Workbook" ) ) )
     {
         pType = "calc_MS_Excel_97";
     }
-    else if ( rStg.IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PowerPoint Document" ) ) ) )
+    else if ( rStg.IsStream( rtl::OUString("PowerPoint Document") ) )
     {
         pType = "impress_MS_PowerPoint_97";
     }
-    else if ( rStg.IsStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Equation Native" ) ) ) )
+    else if ( rStg.IsStream( rtl::OUString("Equation Native") ) )
     {
         pType = "math_MathType_3x";
     }