Easy Hacks : RTL_CONSTASCII_USTRINGPARAM

6 files changed, 19 insertions, 19 deletions

diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 593972245a..cf83f280ee 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -116,8 +116,8 @@ handleNoSuchFilterRequest_(
     try
     {
         xFilterContainer.set( xServiceFactory->createInstance(
-                                  ::rtl::OUString::createFromAscii(
-                                      "com.sun.star.document.FilterFactory") ),
+                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                      "com.sun.star.document.FilterFactory")) ),
                               uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -147,8 +147,8 @@ handleNoSuchFilterRequest_(
     //            out by using DocumentService property later!
     uno::Reference< container::XEnumeration > xFilters
         = xFilterContainer->createSubSetEnumerationByQuery(
-            ::rtl::OUString::createFromAscii(
-                "_query_all:sort_prop=uiname:iflags=1:eflags=143360"));
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "_query_all:sort_prop=uiname:iflags=1:eflags=143360")));
     while (xFilters->hasMoreElements())
     {
         try
@@ -157,9 +157,9 @@ handleNoSuchFilterRequest_(
             uui::FilterNamePair             aPair;
 
             aPair.sInternal = lProps.getUnpackedValueOrDefault(
-                rtl::OUString::createFromAscii("Name"), ::rtl::OUString());
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), ::rtl::OUString());
             aPair.sUI       = lProps.getUnpackedValueOrDefault(
-                 rtl::OUString::createFromAscii("UIName"), ::rtl::OUString());
+                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), ::rtl::OUString());
             if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) )
             {
                continue;
@@ -224,8 +224,8 @@ handleAmbigousFilterRequest_(
     try
     {
         xFilterContainer.set( xServiceFactory->createInstance(
-            ::rtl::OUString::createFromAscii(
-                "com.sun.star.document.FilterFactory") ),
+            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "com.sun.star.document.FilterFactory")) ),
             uno::UNO_QUERY );
     }
     catch ( uno::Exception & )
@@ -325,8 +325,8 @@ handleFilterOptionsRequest_(
     try
     {
         xFilterCFG.set( xServiceFactory->createInstance(
-                            ::rtl::OUString::createFromAscii(
-                                "com.sun.star.document.FilterFactory" ) ),
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                "com.sun.star.document.FilterFactory" )) ),
                         uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -343,7 +343,7 @@ handleFilterOptionsRequest_(
             {
                 rtl::OUString tmp = rRequest.rProperties[ind].Name;
                 if( rRequest.rProperties[ind].Name.equals(
-                        ::rtl::OUString::createFromAscii("FilterName")) )
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"))) )
                 {
                     rRequest.rProperties[ind].Value >>= aFilterName;
                     break;
@@ -358,7 +358,7 @@ handleFilterOptionsRequest_(
                      nProperty < nPropertyCount;
                      ++nProperty )
                     if( aProps[nProperty].Name.equals(
-                            ::rtl::OUString::createFromAscii("UIComponent")) )
+                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
                     {
                         ::rtl::OUString aServiceName;
                         aProps[nProperty].Value >>= aServiceName;
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 3c8452fb6b..b13f60b8c2 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -83,7 +83,7 @@ isDomainMatch(
     if (hostName.equalsIgnoreAsciiCase( certHostName ))
         return true;
 
-    if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) &&
+    if ( 0 == certHostName.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "*" )) ) &&
               hostName.getLength() >= certHostName.getLength()  )
     {
         rtl::OUString cmpStr = certHostName.copy( 1 );
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index a119399dcc..c36a50cd33 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -959,8 +959,8 @@ UUIInteractionHelper::getInteractionHandlerList(
     {
         uno::Reference< lang::XMultiServiceFactory > xConfigProv(
             m_xServiceFactory->createInstance(
-                rtl::OUString::createFromAscii(
-                    "com.sun.star.configuration.ConfigurationProvider" ) ),
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.configuration.ConfigurationProvider" )) ),
             uno::UNO_QUERY );
 
         if ( !xConfigProv.is() )
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 4ab29d3764..6973a236e7 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -48,9 +48,9 @@ sal_Bool writeInfo( void * pRegistryKey,
                     const OUString & rImplementationName,
                     Sequence< OUString > const & rServiceNames )
 {
-    OUString aKeyName( OUString::createFromAscii( "/" ) );
+    OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
     aKeyName += rImplementationName;
-    aKeyName += OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
 
     Reference< XRegistryKey > xKey;
     try
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 7db821a6bf..a613d48816 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( SSLWarnDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
     uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
 
     xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
-                    getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
+                    getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
     
     xDocumentDigitalSignatures.get()->showCertificate(getCert());
 
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 42d33d9ab3..256693cb1c 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -56,7 +56,7 @@ IMPL_LINK( UnknownAuthDialog, ViewCertHdl_Impl, PushButton *, EMPTYARG )
     uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
 
     xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
-                    getServiceFactory().get()->createInstance( rtl::OUString::createFromAscii( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
+                    getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
     
     xDocumentDigitalSignatures.get()->showCertificate(getCert());