targeted string re-work

Change-Id: I56fe169cb78e8b3d57a5949f90b8d364e95a3917

3 files changed, 8 insertions, 10 deletions

diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx
index 4527dab12b27..4a9d39ba15ec 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -103,8 +103,7 @@ getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI)
         xContext->getServiceManager(), uno::UNO_SET_THROW);
     uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
         xServiceFactory->createInstanceWithContext(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "com.sun.star.uri.UriReferenceFactory")), xContext),
+            ::rtl::OUString( "com.sun.star.uri.UriReferenceFactory"), xContext),
         uno::UNO_QUERY_THROW);
 
     uno::Reference< uri::XUriReference > const xBaseURI(
@@ -214,7 +213,7 @@ RDFaExportHelper::AddRDFa(
                 ::boost::bind(&makeCURIE, &m_rExport,
                     ::boost::bind(&rdf::Statement::Predicate, _1))),
             ::comphelper::OUStringBufferAppender(property),
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")));
+            ::rtl::OUString(" "));
 
         m_rExport.AddAttribute(XML_NAMESPACE_XHTML, token::XML_PROPERTY,
             property.makeStringAndClear());
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 56cb96080257..b29473b6ace6 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -138,7 +138,7 @@ uno::Any SAL_CALL SvUnoAttributeContainer::getByName(const OUString& aName)
 
     xml::AttributeData aData;
     aData.Namespace = mpContainer->GetAttrNamespace(nAttr);
-    aData.Type = OUString(RTL_CONSTASCII_USTRINGPARAM("CDATA"));
+    aData.Type = OUString("CDATA");
     aData.Value = mpContainer->GetAttrValue(nAttr);
 
     uno::Any aAny;
@@ -265,13 +265,13 @@ void SAL_CALL SvUnoAttributeContainer::removeByName(const OUString& Name)
 //XServiceInfo
 OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( uno::RuntimeException )
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( "SvUnoAttributeContainer" ));
+    return OUString( "SvUnoAttributeContainer" );
 }
 
 uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void)
     throw( uno::RuntimeException )
 {
-    OUString aSN( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.AttributeContainer" )) );
+    OUString aSN( OUString( "com.sun.star.xml.AttributeContainer" ) );
     uno::Sequence< OUString > aNS( &aSN, 1L );
     return aNS;
 }
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 804bdae9bfc4..b8fc35dea068 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -98,7 +98,7 @@ void SvXMLUnitConverter::Impl::createNumTypeInfo() const
         const_cast<Impl*>(this)->m_xNumTypeInfo =
             Reference < XNumberingTypeInfo > (
                 m_xServiceFactory->createInstance(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.DefaultNumberingProvider") ) ), UNO_QUERY );
+                    OUString("com.sun.star.text.DefaultNumberingProvider" ) ), UNO_QUERY );
     }
 }
 
@@ -309,7 +309,7 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c
     if (xNumberFormatsSupplier.is())
     {
         const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings();
-        return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_NULLDATE))) >>= m_pImpl->m_aNullDate);
+        return xPropertySet.is() && (xPropertySet->getPropertyValue(rtl::OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate);
     }
     return sal_False;
 }
@@ -813,8 +813,7 @@ OUString SvXMLUnitConverter::encodeStyleName(
                                 ->m_pImpl->m_xCharClass =
                                     Reference < XCharacterClassification >(
                                 m_pImpl->m_xServiceFactory->createInstance(
-                                    OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.i18n.CharacterClassification_Unicode")) ),
+                                    OUString( "com.sun.star.i18n.CharacterClassification_Unicode") ),
                                 UNO_QUERY );
 
                             OSL_ENSURE( m_pImpl->m_xCharClass.is(),