targeted string re-work

Change-Id: I2124610768910ff147ca6496b178c91ea90b48ac

4 files changed, 15 insertions, 15 deletions

diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 09bad4c9bbb5..86e2910deadd 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -200,8 +200,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
     // * for windows system address book
     //      "sdbc:address:outlookexp:"     -> aboutlookdirectory://oe/
     //
-        m_sBindDN   = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""));
-        m_sPassword = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(""));
+        m_sBindDN   = rtl::OUString( "");
+        m_sPassword = rtl::OUString( "");
         m_bUseSSL   = sal_False;
 
     if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_MOZILLA ) ) == 0 ) {
@@ -288,19 +288,19 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
             throwSQLException( STR_NO_HOSTNAME, *this );
 
         if ( nPortNumber > 0 ) {
-            m_sMozillaURI += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(":") );
+            m_sMozillaURI += rtl::OUString( ":" );
             m_sMozillaURI += rtl::OUString::valueOf( nPortNumber );
         }
 
         if ( !sBaseDN.isEmpty() ) {
-            m_sMozillaURI += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") );
+            m_sMozillaURI += rtl::OUString( "/" );
             m_sMozillaURI += sBaseDN;
         }
         else
             throwSQLException( STR_NO_BASEDN, *this );
 
         // Addition of a fake query to enable the Mozilla LDAP directory to work correctly.
-        m_sMozillaURI += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("?(or(DisplayName,=,DontDoThisAtHome)))"));
+        m_sMozillaURI += ::rtl::OUString( "?(or(DisplayName,=,DontDoThisAtHome)))");
 
     }
     else if ( aAddrbookScheme.compareToAscii( getSdbcScheme( SDBC_OUTLOOK_MAPI ) ) == 0 ) {
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 0d7d3af913fd..16e3f01d9b5b 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -95,7 +95,7 @@ void MozillaBootstrap::disposing()
 //------------------------------------------------------------------------------
 rtl::OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MOZAB_MozillaBootstrap_IMPL_NAME));
+    return rtl::OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
@@ -103,7 +103,7 @@ Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(
     // which service is supported
     // for more information @see com.sun.star.mozilla.MozillaBootstrap
     Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+    aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap");
     return aSNS;
 }
 
@@ -260,7 +260,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                 if ( aImplName == "com.sun.star.comp.mozilla.MozillaBootstrap" )
                 {
                     Sequence< ::rtl::OUString > aSNS( 1 );
-                    aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+                    aSNS[0] = ::rtl::OUString( "com.sun.star.mozilla.MozillaBootstrap");
 
                     xFactory = ::cppu::createSingleFactory(
                         reinterpret_cast< XMultiServiceFactory* > ( pServiceManager),
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index b1709562823c..bf576519e85e 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4485,8 +4485,8 @@ IParseContext::InternationalKeyCode OParseContext::getIntlKeyCode(const ::rtl::O
 static Locale& impl_getLocaleInstance( )
 {
 	static Locale s_aLocale(
-		::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) ),
-		::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) ),
+		::rtl::OUString( "en"  ),
+		::rtl::OUString( "US"  ),
 		::rtl::OUString( )
 	);
 	return s_aLocale;
@@ -4832,7 +4832,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*& pLiteral)
 //-----------------------------------------------------------------------------
 sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral)
 {
-	OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("=")), SQL_NODE_EQUAL);
+	OSQLParseNode* pComp = new OSQLInternalNode(::rtl::OUString("="), SQL_NODE_EQUAL);
 	return buildPredicateRule(pAppend,pLiteral,pComp);
 }
 
@@ -4861,7 +4861,7 @@ void OSQLParser::error(const sal_Char *fmt)
 	if(!m_sErrorMessage.getLength())
 	{
 		::rtl::OUString sStr(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
-		::rtl::OUString sSQL_TOKEN(RTL_CONSTASCII_USTRINGPARAM("SQL_TOKEN_"));
+		::rtl::OUString sSQL_TOKEN("SQL_TOKEN_");
 
 		sal_Int32 nPos1 = sStr.indexOf(sSQL_TOKEN);
 		if(nPos1 != -1)
@@ -4885,7 +4885,7 @@ void OSQLParser::error(const sal_Char *fmt)
 		::rtl::OUString aError = s_pScanner->getErrorMessage();
 		if(aError.getLength())
 		{
-			m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", "));
+			m_sErrorMessage += ::rtl::OUString(", ");
 			m_sErrorMessage += aError;
 		}
 	}
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index 0bb1bb1b3493..b3562a8403a8 100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
@@ -732,8 +732,8 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt)
 	m_sErrorMessage = ::rtl::OUString(fmt,strlen(fmt),RTL_TEXTENCODING_UTF8);
 	if (m_nCurrentPos < m_sStatement.getLength())
 	{
-		m_sErrorMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": "));
-		
+		m_sErrorMessage += ::rtl::OUString(": ");
+
 		::rtl::OUString aError;
 		static sal_Int32 BUFFERSIZE = 256;
 		static sal_Char* Buffer = 0;