targeted string re-work

Change-Id: I39922dc7cbb32ce236995df89b183d4db1210b15

4 files changed, 15 insertions, 19 deletions

diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 94d54eac2dfc..18103e47789a 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -82,7 +82,7 @@ executeFilterDialog(
     catch (std::bad_alloc const &)
     {
         throw uno::RuntimeException(
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")),
+            rtl::OUString("out of memory"),
             uno::Reference< uno::XInterface >());
     }
 }
@@ -115,8 +115,7 @@ handleNoSuchFilterRequest_(
     try
     {
         xFilterContainer.set( xServiceFactory->createInstance(
-                                  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                      "com.sun.star.document.FilterFactory")) ),
+                                  ::rtl::OUString( "com.sun.star.document.FilterFactory") ),
                               uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -146,8 +145,7 @@ handleNoSuchFilterRequest_(
     //            out by using DocumentService property later!
     uno::Reference< container::XEnumeration > xFilters
         = xFilterContainer->createSubSetEnumerationByQuery(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "_query_all:sort_prop=uiname:iflags=1:eflags=143360")));
+            ::rtl::OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360"));
     while (xFilters->hasMoreElements())
     {
         try
@@ -156,9 +154,9 @@ handleNoSuchFilterRequest_(
             uui::FilterNamePair             aPair;
 
             aPair.sInternal = lProps.getUnpackedValueOrDefault(
-                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), ::rtl::OUString());
+                rtl::OUString("Name"), ::rtl::OUString());
             aPair.sUI       = lProps.getUnpackedValueOrDefault(
-                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIName")), ::rtl::OUString());
+                 rtl::OUString("UIName"), ::rtl::OUString());
             if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) )
             {
                continue;
@@ -223,8 +221,7 @@ handleAmbigousFilterRequest_(
     try
     {
         xFilterContainer.set( xServiceFactory->createInstance(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.document.FilterFactory")) ),
+            ::rtl::OUString( "com.sun.star.document.FilterFactory") ),
             uno::UNO_QUERY );
     }
     catch ( uno::Exception & )
@@ -324,8 +321,7 @@ handleFilterOptionsRequest_(
     try
     {
         xFilterCFG.set( xServiceFactory->createInstance(
-                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                "com.sun.star.document.FilterFactory" )) ),
+                            ::rtl::OUString( "com.sun.star.document.FilterFactory" ) ),
                         uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -341,7 +337,7 @@ handleFilterOptionsRequest_(
             for( sal_Int32 ind = 0; ind < nPropCount; ++ind )
             {
                 if( rRequest.rProperties[ind].Name.equals(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"))) )
+                        ::rtl::OUString("FilterName")) )
                 {
                     rRequest.rProperties[ind].Value >>= aFilterName;
                     break;
@@ -356,7 +352,7 @@ handleFilterOptionsRequest_(
                      nProperty < nPropertyCount;
                      ++nProperty )
                     if( aProps[nProperty].Name.equals(
-                            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UIComponent"))) )
+                            ::rtl::OUString("UIComponent")) )
                     {
                         ::rtl::OUString aServiceName;
                         aProps[nProperty].Value >>= aServiceName;
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 53812e298e02..06ef9b70b7a3 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -97,7 +97,7 @@ isDomainMatch(
        if (hostName.equalsIgnoreAsciiCase( element ))
            return true;
 
-       if ( 0 == element.indexOf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "*" )) ) &&
+       if ( 0 == element.indexOf( rtl::OUString( "*" ) ) &&
                  hostName.getLength() >= element.getLength()  )
        {
            rtl::OUString cmpStr = element.copy( 1 );
@@ -133,7 +133,7 @@ getLocalizedDatTimeStr(
 
     pNumberFormatter->GetOutputString(
         aDate - *pNullDate, nFormat, aTmpStr, &pColor );
-    aDateTimeStr = aTmpStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+    aDateTimeStr = aTmpStr + rtl::OUString(" ");
 
     nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang );
     pNumberFormatter->GetOutputString(
@@ -184,7 +184,7 @@ executeUnknownAuthDialog(
     catch (std::bad_alloc const &)
     {
         throw uno::RuntimeException(
-                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")),
+                  rtl::OUString("out of memory"),
                   uno::Reference< uno::XInterface >());
     }
 }
@@ -258,7 +258,7 @@ executeSSLWarnDialog(
     catch (std::bad_alloc const &)
     {
         throw uno::RuntimeException(
-                  rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("out of memory")),
+                  rtl::OUString("out of memory"),
                   uno::Reference< uno::XInterface >());
     }
 }
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 7fd1a83d66c0..7a94b7cbd4d1 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -49,7 +49,7 @@ IMPL_LINK_NOARG(SSLWarnDialog, ViewCertHdl_Impl)
     uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
 
     xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
-                    getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
+                    getServiceFactory().get()->createInstance( rtl::OUString( "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 abd631f94b64..b21377931c7f 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -56,7 +56,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl)
     uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures;
 
     xDocumentDigitalSignatures = uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >(
-                    getServiceFactory().get()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.security.DocumentDigitalSignatures" ))), uno::UNO_QUERY );
+                    getServiceFactory().get()->createInstance( rtl::OUString( "com.sun.star.security.DocumentDigitalSignatures" )), uno::UNO_QUERY );
 
     xDocumentDigitalSignatures.get()->showCertificate(getCert());