reduce scope and replace some String::CreateFromAscii

Change-Id: I8c375e3bfbcd3d7046a8bdb1968934b7d7ca96f8

2 files changed, 17 insertions, 23 deletions

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index fbcc445f9f54..88c527808613 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6766,8 +6766,7 @@ SdrObject* SvxMSDffManager::ImportOLE( long nOLEId,
 
 sal_Bool SvxMSDffManager::MakeContentStream( SotStorage * pStor, const GDIMetaFile & rMtf )
 {
-    String aPersistStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) );
-    SotStorageStreamRef xStm = pStor->OpenSotStream( aPersistStream );
+    SotStorageStreamRef xStm = pStor->OpenSotStream(rtl::OUString(SVEXT_PERSIST_STREAM));
     xStm->SetVersion( pStor->GetVersion() );
     xStm->SetBufferSize( 8192 );
 
@@ -6908,7 +6907,7 @@ sal_Bool SvxMSDffManager::ConvertToOle2( SvStream& rStm, sal_uInt32 nReadLen,
                     const GDIMetaFile * pMtf, const SotStorageRef& rDest )
 {
     sal_Bool bMtfRead = sal_False;
-    SotStorageStreamRef xOle10Stm = rDest->OpenSotStream( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "\1Ole10Native" ) ),
+    SotStorageStreamRef xOle10Stm = rDest->OpenSotStream( rtl::OUString("\1Ole10Native"),
                                                     STREAM_WRITE| STREAM_SHARE_DENYALL );
     if( xOle10Stm->GetError() )
         return sal_False;
@@ -7174,7 +7173,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >  SvxMS
         static sal_Int32 nOleCount(0);
         String aTmpName(RTL_CONSTASCII_USTRINGPARAM("/tmp/embedded_stream_"));
         aTmpName += String::CreateFromInt32(nOleCount++);
-        aTmpName += String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(".bin"));
+        aTmpName += rtl::OUString(".bin");
         SvFileStream aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
         pStream->Seek(0);
         *pStream >> aTmpStream;
@@ -7183,7 +7182,7 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >  SvxMS
         if ( pName || pFilter )
         {
             //Reuse current ole name
-            String aDstStgName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(MSO_OLE_Obj)));
+            rtl::OUString aDstStgName(MSO_OLE_Obj);
             aDstStgName += String::CreateFromInt32(nMSOleObjCntr);
 
             ::rtl::OUString aFilterName;
@@ -7288,8 +7287,7 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
         // ( ist er z.B. bei FontWork nicht )
         // Wenn nicht -> Einbindung als Grafik
         sal_Bool bValidStorage = sal_False;
-        String aDstStgName( String::CreateFromAscii(
-                                RTL_CONSTASCII_STRINGPARAM(MSO_OLE_Obj)));
+        rtl::OUString aDstStgName(MSO_OLE_Obj);
 
         aDstStgName += String::CreateFromInt32( ++nMSOleObjCntr );
 
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index edd0ad7a160f..0ba8b7e342c3 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -53,9 +53,6 @@
 
 #include "filter/msfilter/msoleexp.hxx"
 
-#define CREATE_CONST_ASC(s) String::CreateFromAscii( \
-    RTL_CONSTASCII_STRINGPARAM(s))
-
 using namespace ::com::sun::star;
 
 SvGlobalName GetEmbeddedVersion( const SvGlobalName& aAppName )
@@ -79,19 +76,18 @@ SvGlobalName GetEmbeddedVersion( const SvGlobalName& aAppName )
 String GetStorageType( const SvGlobalName& aEmbName )
 {
     if ( aEmbName == SvGlobalName( SO3_SM_OLE_EMBED_CLASSID_8 ) )
-            return String::CreateFromAscii( "LibreOffice.MathDocument.1" );
+        return rtl::OUString("LibreOffice.MathDocument.1");
     else if ( aEmbName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_8 ) )
-            return String::CreateFromAscii( "LibreOffice.WriterDocument.1" );
+        return rtl::OUString("LibreOffice.WriterDocument.1");
     else if ( aEmbName == SvGlobalName( SO3_SC_OLE_EMBED_CLASSID_8 ) )
-            return String::CreateFromAscii( "LibreOffice.CalcDocument.1" );
+        return rtl::OUString("LibreOffice.CalcDocument.1");
     else if ( aEmbName == SvGlobalName( SO3_SDRAW_OLE_EMBED_CLASSID_8 ) )
-            return String::CreateFromAscii( "LibreOffice.DrawDocument.1" );
+        return rtl::OUString("LibreOffice.DrawDocument.1");
     else if ( aEmbName == SvGlobalName( SO3_SIMPRESS_OLE_EMBED_CLASSID_8 ) )
-            return String::CreateFromAscii( "LibreOffice.ImpressDocument.1" );
+        return rtl::OUString("LibreOffice.ImpressDocument.1");
     else if ( aEmbName == SvGlobalName( SO3_SCH_OLE_EMBED_CLASSID_8 ) )
-            return String::CreateFromAscii( "LibreOffice.ChartDocument.1" );
-
-    return String();
+        return rtl::OUString("LibreOffice.ChartDocument.1");
+    return rtl::OUString();
 }
 
 sal_Bool UseOldMSExport()
@@ -239,8 +235,8 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
                                 SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE,
                                 GetStorageType( aEmbName ) );
             SotStorageStreamRef xExtStm = rDestStg.OpenSotStream(
-                                            String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "properties_stream" ) ),
-                                            STREAM_STD_READWRITE );
+                                            rtl::OUString("properties_stream"),
+                                            STREAM_STD_READWRITE);
 
             sal_Bool bExtentSuccess = sal_False;
             if( !xExtStm->GetError() )
@@ -294,8 +290,8 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
             if ( bExtentSuccess )
             {
                 SotStorageStreamRef xEmbStm = rDestStg.OpenSotStream(
-                                                String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "package_stream" ) ),
-                                                STREAM_STD_READWRITE );
+                                                rtl::OUString("package_stream"),
+                                                STREAM_STD_READWRITE);
                 if( !xEmbStm->GetError() )
                 {
                     try
@@ -349,7 +345,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
     }
 
     //We never need this stream: See #99809# and #i2179#
-    rDestStg.Remove(CREATE_CONST_ASC(SVEXT_PERSIST_STREAM));
+    rDestStg.Remove(rtl::OUString(SVEXT_PERSIST_STREAM));
 }