remove most use of RTL_CONSTASCII_USTRINGPARAM macro

This is largely unnecessary when working with OUString

Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be

3 files changed, 15 insertions, 26 deletions

diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 464dd5b519c7..254f7953f8a5 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -47,15 +47,13 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
 
         if ( isEnhMeta )
         {
-            aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                "application/x-openoffice-emf;windows_formatname=\"Image EMF\"" ) );
-            aFlavor.HumanPresentableName = OUString( "Enhanced Windows MetaFile" );
+            aFlavor.MimeType = "application/x-openoffice-emf;windows_formatname=\"Image EMF\"";
+            aFlavor.HumanPresentableName = "Enhanced Windows MetaFile";
         }
         else
         {
-            aFlavor.MimeType = OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                                "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ) );
-            aFlavor.HumanPresentableName = OUString( "Windows GDIMetaFile" );
+            aFlavor.MimeType = "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"";
+            aFlavor.HumanPresentableName = "Windows GDIMetaFile";
         }
 
         aFlavor.DataType = getCppuType( (const sal_uInt64*) 0 );
diff --git a/embedserv/source/embed/guid.cxx b/embedserv/source/embed/guid.cxx
index f757bf914785..b76d851bb1e9 100644
--- a/embedserv/source/embed/guid.cxx
+++ b/embedserv/source/embed/guid.cxx
@@ -97,31 +97,31 @@ OUString getServiceNameFromGUID_Impl( GUID* guid )
 OUString getFilterNameFromGUID_Impl( GUID* guid )
 {
     if ( *guid == OID_WriterTextServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Writer)" ) );
+        return OUString( "StarOffice XML (Writer)" );
 
     if ( *guid == OID_WriterOASISTextServer )
         return OUString( "writer8" );
 
     if ( *guid == OID_CalcServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Calc)" ) );
+        return OUString( "StarOffice XML (Calc)" );
 
     if ( *guid == OID_CalcOASISServer )
         return OUString( "calc8" );
 
     if ( *guid == OID_DrawingServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Draw)" ) );
+        return OUString( "StarOffice XML (Draw)" );
 
     if ( *guid == OID_DrawingOASISServer )
         return OUString( "draw8" );
 
     if ( *guid == OID_PresentationServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Impress)" ) );
+        return OUString( "StarOffice XML (Impress)" );
 
     if ( *guid == OID_PresentationOASISServer )
         return OUString( "impress8" );
 
     if ( *guid == OID_MathServer )
-        return OUString( RTL_CONSTASCII_USTRINGPARAM ( "StarOffice XML (Math)" ) );
+        return OUString( "StarOffice XML (Math)" );
 
     if ( *guid == OID_MathOASISServer )
         return OUString( "math8" );
diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx
index dbae2024b459..eba61b4b55d1 100644
--- a/embedserv/source/embed/intercept.cxx
+++ b/embedserv/source/embed/intercept.cxx
@@ -261,25 +261,20 @@ void Interceptor::generateFeatureStateEvent()
 
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[0];
                 aStateEvent.FeatureDescriptor = "Update";
-                aStateEvent.State <<= (OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
-                                       aTitle);
+                aStateEvent.State <<= (OUString("($1) ") + aTitle);
 
             }
             else if ( i == 5 )
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[5];
                 aStateEvent.FeatureDescriptor = "SaveCopyTo";
-                aStateEvent.State <<= (OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($3)")));
+                aStateEvent.State <<= (OUString("($3)"));
             }
             else
             {
                 aStateEvent.FeatureURL.Complete = m_aInterceptedURL[i];
                 aStateEvent.FeatureDescriptor = "Close and Return";
-                aStateEvent.State <<= (OUString(
-                    RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
-                                       aTitle);
+                aStateEvent.State <<= (OUString("($2) ") + aTitle);
 
             }
 
@@ -328,9 +323,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "Update";
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString(
-            RTL_CONSTASCII_USTRINGPARAM("($1) ")) +
-                               aTitle );
+        aStateEvent.State <<= (OUString("($1) ") + aTitle );
         Control->statusChanged(aStateEvent);
 
         {
@@ -368,9 +361,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "Close and Return";
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString(
-            RTL_CONSTASCII_USTRINGPARAM("($2) ")) +
-                               aTitle );
+        aStateEvent.State <<= (OUString("($2) ") + aTitle );
         Control->statusChanged(aStateEvent);
 
 
@@ -392,7 +383,7 @@ Interceptor::addStatusListener(
         aStateEvent.FeatureDescriptor = "SaveCopyTo";
         aStateEvent.IsEnabled = sal_True;
         aStateEvent.Requery = sal_False;
-        aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
+        aStateEvent.State <<= (OUString("($3)"));
         Control->statusChanged(aStateEvent);
 
         {