targeted string re-work

Change-Id: Id37249ba16f543798324ee2cac566ec56d8e378e

2 files changed, 31 insertions, 31 deletions

diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 73374214251b..15639622b002 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -404,7 +404,7 @@ template< typename T >
     ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap)
 {
     static rtlRandomPool s_Pool( rtl_random_createPool() );
-    const ::rtl::OUString prefix(RTL_CONSTASCII_USTRINGPARAM(s_prefix));
+    const ::rtl::OUString prefix(s_prefix);
     typename ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash >
         ::const_iterator iter;
     ::rtl::OUString id;
@@ -521,8 +521,8 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElement(
 {
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId"), 0, 0);
     }
 
     const XmlIdList_t * pList( LookupElementList(i_rStreamName, i_rIdref) );
@@ -687,15 +687,15 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
 
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId"), 0, 0);
     }
     if (i_rObject.IsInContent()
         ?   !isContentFile(i_rStreamName)
         :   !isStylesFile(i_rStreamName))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId: wrong stream")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId: wrong stream"), 0, 0);
     }
 
     ::rtl::OUString old_path;
@@ -990,8 +990,8 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry(
 {
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId"), 0, 0);
     }
 
     const ClipboardXmlIdMap_t::const_iterator iter( m_XmlIdMap.find(i_rIdref) );
@@ -1119,15 +1119,15 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
 
     if (!isValidXmlId(i_rStreamName, i_rIdref))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId"), 0, 0);
     }
     if (i_rObject.IsInContent()
         ?   !isContentFile(i_rStreamName)
         :   !isStylesFile(i_rStreamName))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId: wrong stream")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId: wrong stream"), 0, 0);
     }
 
     ::rtl::OUString old_path;
@@ -1256,8 +1256,8 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
 
     if (!isValidXmlId(i_rReference.First, i_rReference.Second))
     {
-        throw lang::IllegalArgumentException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "illegal XmlId")), 0, 0);
+        throw lang::IllegalArgumentException(::rtl::OUString(
+            "illegal XmlId"), 0, 0);
     }
 
     if (!i_isLatent)
@@ -1349,8 +1349,8 @@ Metadatable::SetMetadataReference(
         else
         {
             throw lang::IllegalArgumentException(
-                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Metadatable::"
-                    "SetMetadataReference: argument is invalid")), /*this*/0, 0);
+                ::rtl::OUString("Metadatable::"
+                    "SetMetadataReference: argument is invalid"), /*this*/0, 0);
         }
     }
 }
@@ -1616,8 +1616,8 @@ throw (uno::RuntimeException)
     if (!pObject)
     {
         throw uno::RuntimeException(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "MetadatableMixin: cannot get core object; not inserted?")),
+            ::rtl::OUString(
+                "MetadatableMixin: cannot get core object; not inserted?"),
             *this);
     }
     return pObject->GetMetadataReference();
@@ -1634,8 +1634,8 @@ throw (uno::RuntimeException, lang::IllegalArgumentException)
     if (!pObject)
     {
         throw uno::RuntimeException(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "MetadatableMixin: cannot get core object; not inserted?")),
+            ::rtl::OUString(
+                "MetadatableMixin: cannot get core object; not inserted?"),
             *this);
     }
     return pObject->SetMetadataReference(i_rReference);
@@ -1650,8 +1650,8 @@ throw (uno::RuntimeException)
     if (!pObject)
     {
         throw uno::RuntimeException(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                "MetadatableMixin: cannot get core object; not inserted?")),
+            ::rtl::OUString(
+                "MetadatableMixin: cannot get core object; not inserted?"),
             *this);
     }
     return pObject->EnsureMetadataReference();
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index b7a68ec1b434..e1671d51ff8e 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -75,7 +75,7 @@ SfxURLToolBoxControl_Impl::SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uI
     : SfxToolBoxControl( nSlotId, nId, rBox ),
     pAccExec( 0 )
 {
-    addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CurrentURL" )));
+    addStatusListener( rtl::OUString( ".uno:CurrentURL" ));
 }
 
 SfxURLToolBoxControl_Impl::~SfxURLToolBoxControl_Impl()
@@ -112,7 +112,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/
     if ( xDispatchProvider.is() && m_xServiceManager.is() )
     {
         URL             aTargetURL;
-        ::rtl::OUString aTarget( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")));
+        ::rtl::OUString aTarget( ::rtl::OUString("_default"));
 
         aTargetURL.Complete = aName;
 
@@ -121,17 +121,17 @@ void SfxURLToolBoxControl_Impl::OpenURL( const String& rName, sal_Bool /*bNew*/
         if ( xDispatch.is() )
         {
             Sequence< PropertyValue > aArgs( 2 );
-            aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
-            aArgs[0].Value = makeAny( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SFX_REFERER_USER )));
-            aArgs[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ));
+            aArgs[0].Name = ::rtl::OUString("Referer");
+            aArgs[0].Value = makeAny( ::rtl::OUString(SFX_REFERER_USER ));
+            aArgs[1].Name = ::rtl::OUString( "FileName" );
             aArgs[1].Value = makeAny( ::rtl::OUString( aName ));
 
             if ( aFilter.Len() )
             {
                 aArgs.realloc( 4 );
-                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterOptions"));
+                aArgs[2].Name = ::rtl::OUString("FilterOptions");
                 aArgs[2].Value = makeAny( ::rtl::OUString( aOptions ));
-                aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
+                aArgs[3].Name = ::rtl::OUString("FilterName");
                 aArgs[3].Value = makeAny( ::rtl::OUString( aFilter ));
             }
 
@@ -192,7 +192,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, OpenHdl)
     if ( m_xServiceManager.is() )
     {
         Reference< XFramesSupplier > xDesktop( m_xServiceManager->createInstance(
-                                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"))),
+                                                ::rtl::OUString("com.sun.star.frame.Desktop")),
                                              UNO_QUERY );
         Reference< XFrame > xFrame( xDesktop->getActiveFrame(), UNO_QUERY );
         if ( xFrame.is() )