targeted string re-work

Change-Id: I588fadc51fec90b3b04d61c2c63880236c535183

3 files changed, 14 insertions, 14 deletions

diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 8d29aaa0852e..405a8fa1998c 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -493,7 +493,7 @@ namespace xmloff
     {
         // no optimization here. If this method gets called, the XML stream did not contain a name for the
         // element, which is a heavy error. So in this case we don't care for performance
-        static const ::rtl::OUString sUnnamedName(RTL_CONSTASCII_USTRINGPARAM("unnamed"));
+        static const ::rtl::OUString sUnnamedName("unnamed");
         OSL_ENSURE(m_xParentContainer.is(), "OElementImport::implGetDefaultName: no parent container!");
         if (!m_xParentContainer.is())
             return sUnnamedName;
@@ -1581,7 +1581,7 @@ namespace xmloff
         PropertyValueArray::iterator aDefaultControlPropertyPos = ::std::find_if(
             m_aValues.begin(),
             m_aValues.end(),
-            EqualName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultControl" ) ) )
+            EqualName( ::rtl::OUString( "DefaultControl"  ) )
         );
         if ( aDefaultControlPropertyPos != m_aValues.end() )
         {
@@ -1651,12 +1651,12 @@ namespace xmloff
             const Reference< XAttributeList >& _rxAttrList)
     {
         // is it the "option" sub tag of a listbox ?
-        static const ::rtl::OUString s_sOptionElementName(RTL_CONSTASCII_USTRINGPARAM("option"));
+        static const ::rtl::OUString s_sOptionElementName("option");
         if (s_sOptionElementName == _rLocalName)
             return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this);
 
         // is it the "item" sub tag of a combobox ?
-        static const ::rtl::OUString s_sItemElementName(RTL_CONSTASCII_USTRINGPARAM("item"));
+        static const ::rtl::OUString s_sItemElementName("item");
         if (s_sItemElementName == _rLocalName)
             return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this);
 
@@ -1737,7 +1737,7 @@ namespace xmloff
             // (somewhere else) to determine that a non-standard binding should be created.
             // This hack is acceptable for OOo 1.1.1, since the file format for value
             // bindings of form controls is to be changed afterwards, anyway.
-            sBoundCellAddress += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ":index" ) );
+            sBoundCellAddress += ::rtl::OUString( ":index"  );
         }
 
         OControlImport::doRegisterCellValueBinding( sBoundCellAddress );
@@ -1868,9 +1868,9 @@ namespace xmloff
         // the label and the value
         const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap();
         const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey(
-            GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("label")));
+            GetPrefix(), ::rtl::OUString("label"));
         const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey(
-            GetPrefix(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value")));
+            GetPrefix(), ::rtl::OUString("value"));
 
         // -------------------
         // the label attribute
diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx
index 945375178c17..4390ac2337e9 100644
--- a/xmloff/source/forms/eventexport.cxx
+++ b/xmloff/source/forms/eventexport.cxx
@@ -105,7 +105,7 @@ namespace xmloff
     void SAL_CALL OEventDescriptorMapper::replaceByName( const ::rtl::OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
     {
         throw IllegalArgumentException(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("replacing is not implemented for this wrapper class.")), static_cast< ::cppu::OWeakObject* >(this), 1);
+            ::rtl::OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1);
     }
 
     //---------------------------------------------------------------------
@@ -114,7 +114,7 @@ namespace xmloff
         ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName);
         if (m_aMappedEvents.end() == aPos)
             throw NoSuchElementException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("There is no element named ")) += _rName,
+                ::rtl::OUString("There is no element named ") += _rName,
                 static_cast< ::cppu::OWeakObject* >(this));
 
         return makeAny(aPos->second);
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 8f75bbc63ea3..07b9487756a0 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -146,7 +146,7 @@ bool ParseURLAsString(
     const OUString& rAttrValue,
     OUString* pName, OUString* pLocation )
 {
-    OUString SCHEME( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ) );
+    OUString SCHEME( "vnd.sun.star.script:"  );
 
     sal_Int32 params = rAttrValue.indexOf( '?' );
     if ( rAttrValue.indexOf( SCHEME ) != 0 || params < 0 )
@@ -201,8 +201,8 @@ bool ParseURL(
         xSMgr = ::comphelper::getProcessServiceFactory();
 
     Reference< com::sun::star::uri::XUriReferenceFactory >
-        xFactory( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "com.sun.star.uri.UriReferenceFactory" )) ), UNO_QUERY );
+        xFactory( xSMgr->createInstance( OUString(
+            "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY );
 
     if ( xFactory.is() )
     {
@@ -304,7 +304,7 @@ void XMLEventOASISTransformerContext::StartElement(
                             GetXMLToken( XML_LANGUAGE ) ) );
 
                         pMutableAttrList->SetValueByIndex( idx,
-                            OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) );
+                            OUString("StarBasic") );
 
                         OUString aLocQName(
                             GetTransformer().GetNamespaceMap().GetQNameByKey(
@@ -356,7 +356,7 @@ void XMLEventOASISTransformerContext::StartElement(
                     GetXMLToken( XML_LANGUAGE ) ) );
 
                     pMutableAttrList->SetValueByIndex( idx,
-                    OUString(RTL_CONSTASCII_USTRINGPARAM("StarBasic")) );
+                    OUString("StarBasic") );
 
                     OUString aLocQName(
                     GetTransformer().GetNamespaceMap().GetQNameByKey(