targeted string re-work

Change-Id: I37e225902bf7f3a6e007e7641b2b9898b044a45b

2 files changed, 39 insertions, 39 deletions

diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 2759b9efab0e..b3fbfd1de478 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -52,8 +52,8 @@ using namespace ::sf_misc;
 #define BASPROV_PROPERTY_ID_URI         1
 #define BASPROV_PROPERTY_ID_EDITABLE    2
 
-#define BASPROV_PROPERTY_URI            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URI" ) )
-#define BASPROV_PROPERTY_EDITABLE       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Editable" ) )
+#define BASPROV_PROPERTY_URI            ::rtl::OUString( "URI"  )
+#define BASPROV_PROPERTY_EDITABLE       ::rtl::OUString( "Editable"  )
 
 #define BASPROV_DEFAULT_ATTRIBS()       PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT | PropertyAttribute::READONLY
 
@@ -85,17 +85,17 @@ namespace basprov
                 StarBASIC* pBasic = static_cast< StarBASIC* >( pModule->GetParent() );
                 if ( pBasic )
                 {
-                    m_sURI = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.script:"));
+                    m_sURI = ::rtl::OUString("vnd.sun.star.script:");
                     m_sURI += pBasic->GetName();
-                    m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+                    m_sURI += ::rtl::OUString(".");
                     m_sURI += pModule->GetName();
-                    m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("."));
+                    m_sURI += ::rtl::OUString(".");
                     m_sURI += m_pMethod->GetName();
-                    m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("?language=Basic&location="));
+                    m_sURI += ::rtl::OUString("?language=Basic&location=");
                     if ( m_bIsAppScript )
-                        m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application"));
+                        m_sURI += ::rtl::OUString("application");
                     else
-                        m_sURI += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("document"));
+                        m_sURI += ::rtl::OUString("document");
                 }
             }
         }
@@ -264,7 +264,7 @@ namespace basprov
                 if ( xSMgr.is() )
                 {
                     Reference< frame::XDesktop > xDesktop( xSMgr->createInstanceWithContext(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ) ), m_xContext ), UNO_QUERY );
+                        ::rtl::OUString( "com.sun.star.frame.Desktop"  ), m_xContext ), UNO_QUERY );
 
                     if ( xDesktop.is() )
                     {
@@ -273,22 +273,22 @@ namespace basprov
                         if ( xProv.is() )
                         {
                             Reference< frame::XDispatchHelper > xHelper( xSMgr->createInstanceWithContext(
-                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.DispatchHelper" ) ), m_xContext ), UNO_QUERY );
+                                ::rtl::OUString( "com.sun.star.frame.DispatchHelper"  ), m_xContext ), UNO_QUERY );
 
                             if ( xHelper.is() )
                             {
                                 Sequence < PropertyValue > aArgs(7);
-                                aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Document"));
+                                aArgs[0].Name = ::rtl::OUString("Document");
                                 aArgs[0].Value <<= sDocURL;
-                                aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LibName"));
+                                aArgs[1].Name = ::rtl::OUString("LibName");
                                 aArgs[1].Value <<= sLibName;
-                                aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+                                aArgs[2].Name = ::rtl::OUString("Name");
                                 aArgs[2].Value <<= sModName;
-                                aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type"));
-                                aArgs[3].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Module"));
-                                aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Line"));
+                                aArgs[3].Name = ::rtl::OUString("Type");
+                                aArgs[3].Value <<= ::rtl::OUString("Module");
+                                aArgs[4].Name = ::rtl::OUString("Line");
                                 aArgs[4].Value <<= static_cast< sal_uInt32 >( nLine1 );
-                                xHelper->executeDispatch( xProv, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:BasicIDEAppear")), ::rtl::OUString(), 0, aArgs );
+                                xHelper->executeDispatch( xProv, ::rtl::OUString(".uno:BasicIDEAppear"), ::rtl::OUString(), 0, aArgs );
                             }
                         }
                     }
@@ -298,7 +298,7 @@ namespace basprov
         else
         {
             throw IllegalArgumentException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicMethodNodeImpl::invoke: function name not supported!" ) ),
+                ::rtl::OUString( "BasicMethodNodeImpl::invoke: function name not supported!"  ),
                 Reference< XInterface >(), 1 );
         }
 
@@ -315,7 +315,7 @@ namespace basprov
         (void)aValue;
 
         throw UnknownPropertyException(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicMethodNodeImpl::setValue: property name is unknown!" ) ),
+            ::rtl::OUString( "BasicMethodNodeImpl::setValue: property name is unknown!"  ),
             Reference< XInterface >() );
     }
 
@@ -326,7 +326,7 @@ namespace basprov
         (void)aPropertyName;
 
         throw UnknownPropertyException(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicMethodNodeImpl::getValue: property name is unknown!" ) ),
+            ::rtl::OUString( "BasicMethodNodeImpl::getValue: property name is unknown!"  ),
             Reference< XInterface >() );
     }
 
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 953c362648bf..ae6a553044eb 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -83,7 +83,7 @@ namespace basprov
             ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
             if ( !pImplName )
             {
-                static ::rtl::OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.scripting.ScriptProviderForBasic" ) );
+                static ::rtl::OUString aImplName( "com.sun.star.comp.scripting.ScriptProviderForBasic"  );
                 pImplName = &aImplName;
             }
         }
@@ -101,10 +101,10 @@ namespace basprov
             if ( !pNames )
             {
                 static Sequence< ::rtl::OUString > aNames(4);
-                aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.ScriptProviderForBasic" ) );
-                aNames.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.LanguageScriptProvider" ) );
-                aNames.getArray()[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.provider.ScriptProvider" ) );
-                aNames.getArray()[3] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.browse.BrowseNode" ) );
+                aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProviderForBasic"  );
+                aNames.getArray()[1] = ::rtl::OUString( "com.sun.star.script.provider.LanguageScriptProvider"  );
+                aNames.getArray()[2] = ::rtl::OUString( "com.sun.star.script.provider.ScriptProvider"  );
+                aNames.getArray()[3] = ::rtl::OUString( "com.sun.star.script.browse.BrowseNode"  );
                 pNames = &aNames;
             }
         }
@@ -148,8 +148,8 @@ namespace basprov
                 Reference< lang::XMultiComponentFactory > xSMgr( m_xContext->getServiceManager() );
                 if ( xSMgr.is() )
                 {
-                    xUriFac.set( xSMgr->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.uri.UriReferenceFactory" )), m_xContext ), UNO_QUERY );
+                    xUriFac.set( xSMgr->createInstanceWithContext( ::rtl::OUString(
+                        "com.sun.star.uri.UriReferenceFactory" ), m_xContext ), UNO_QUERY );
                 }
 
                 if ( xUriFac.is() )
@@ -173,7 +173,7 @@ namespace basprov
                                 aDecodedURL = ::rtl::Uri::decode( aDecodedURL, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
                                 Reference<util::XMacroExpander> xMacroExpander(
                                     m_xContext->getValueByName(
-                                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander")) ),
+                                    ::rtl::OUString("/singletons/com.sun.star.util.theMacroExpander") ),
                                     UNO_QUERY );
                                 if ( xMacroExpander.is() )
                                     aFileURL = xMacroExpander->expandMacros( aDecodedURL );
@@ -191,8 +191,8 @@ namespace basprov
                 OSL_VERIFY( aFileItem.getFileStatus( aFileStatus ) == osl::FileBase::E_None );
                 ::rtl::OUString aCanonicalFileURL( aFileStatus.getFileURL() );
 
-                ::rtl::OUString aSearchURL1( RTL_CONSTASCII_USTRINGPARAM( "share/basic" ) );
-                ::rtl::OUString aSearchURL2( RTL_CONSTASCII_USTRINGPARAM( "share/uno_packages" ) );
+                ::rtl::OUString aSearchURL1( "share/basic"  );
+                ::rtl::OUString aSearchURL2( "share/uno_packages"  );
                 if( aCanonicalFileURL.indexOf( aSearchURL1 ) != -1 || aCanonicalFileURL.indexOf( aSearchURL2 ) != -1 )
                     bIsShared = true;
             }
@@ -243,7 +243,7 @@ namespace basprov
         if ( aArguments.getLength() != 1 )
         {
             throw IllegalArgumentException(
-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicProviderImpl::initialize: incorrect argument count." ) ),
+                ::rtl::OUString( "BasicProviderImpl::initialize: incorrect argument count."  ),
                 *this,
                 1
             );
@@ -258,7 +258,7 @@ namespace basprov
             if ( !xModel.is() )
             {
                 throw IllegalArgumentException(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context." ) ),
+                    ::rtl::OUString( "BasicProviderImpl::initialize: unable to determine the document model from the script invocation context."  ),
                     *this,
                     1
                 );
@@ -269,7 +269,7 @@ namespace basprov
             if ( !( aArguments[0] >>= m_sScriptingContext ) )
             {
                 throw IllegalArgumentException(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicProviderImpl::initialize: incorrect argument type " )  ).concat(  aArguments[0].getValueTypeName() ),
+                    ::rtl::OUString( "BasicProviderImpl::initialize: incorrect argument type "   ).concat(  aArguments[0].getValueTypeName() ),
                     *this,
                     1
                 );
@@ -307,7 +307,7 @@ namespace basprov
             {
                 /*
                 throw RuntimeException(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BasicProviderImpl::initialize: no scripting context!" ) ),
+                    ::rtl::OUString( "BasicProviderImpl::initialize: no scripting context!"  ),
                     Reference< XInterface >() );
                 */
             }
@@ -336,8 +336,8 @@ namespace basprov
         Reference< provider::XScript > xScript;
         Reference< lang::XMultiComponentFactory > xMcFac ( m_xContext->getServiceManager() );
         Reference< uri::XUriReferenceFactory > xFac (
-            xMcFac->createInstanceWithContext( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-            "com.sun.star.uri.UriReferenceFactory")), m_xContext ) , UNO_QUERY );
+            xMcFac->createInstanceWithContext( rtl::OUString(
+            "com.sun.star.uri.UriReferenceFactory"), m_xContext ) , UNO_QUERY );
 
         if ( !xFac.is() )
         {
@@ -354,7 +354,7 @@ namespace basprov
 
         if ( !uriRef.is() || !sfUri.is() )
         {
-            ::rtl::OUString errorMsg(RTL_CONSTASCII_USTRINGPARAM("BasicProviderImpl::getScript: failed to parse URI: "));
+            ::rtl::OUString errorMsg("BasicProviderImpl::getScript: failed to parse URI: ");
             errorMsg = errorMsg.concat( scriptURI );
             throw provider::ScriptFrameworkErrorException(
                 errorMsg, Reference< XInterface >(),
@@ -365,7 +365,7 @@ namespace basprov
 
         ::rtl::OUString aDescription = sfUri->getName();
         ::rtl::OUString aLocation = sfUri->getParameter(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("location")) );
+            ::rtl::OUString("location") );
 
         sal_Int32 nIndex = 0;
         // In some strange circumstances the Library name can have an
@@ -467,7 +467,7 @@ namespace basprov
 
         SolarMutexGuard aGuard;
 
-        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
+        return ::rtl::OUString("Basic");
     }
 
     // -----------------------------------------------------------------------------