diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-14 13:13:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-19 10:29:30 +0200 |
| commit | 2c35fff7eca3a143d28dc75e6a73fe1101d2af77 (patch) | |
| tree | fb31b64880b06b0e2bd867aa6216ae0259c7c091 /connectivity | |
| parent | ccc297097891e62489e5d281a4ea128ec6b71361 (diff) | |
remove most use of RTL_CONSTASCII_USTRINGPARAM macro
This is largely unnecessary when working with OUString
Change-Id: I3cf4d68357a43665d01162ef4a2d5346a45da9be
Diffstat (limited to 'connectivity')
4 files changed, 7 insertions, 9 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index cda9dc531b26..cfbe22524fcd 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -910,7 +910,7 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, Runt aRecordset.MoveFirst(); OLEVariant aValue; - OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(",")); + OUString aRet, aComma(","); while(!aRecordset.IsAtEOF()) { WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(aRecordset.GetFields()); diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index d7b6f4fdcb1b..34c640b6d5e4 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -295,7 +295,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, Runt OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " - return OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); + return OUString("\""); } // ------------------------------------------------------------------------- OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 423a14b46b9d..edb7998b73b9 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -242,7 +242,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo" // So we append ("E-mail" varchar) to the last of it to make it work { - return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True); + return parseSql(sql + "(""E-mail"" caracter)",sal_True); } getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index d7cd83bfc91f..50d0e3a21d5b 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -367,17 +367,15 @@ namespace connectivity else if ( eType == D_NATIVE ) { aDriverInfo.push_back(DriverPropertyInfo( - OUString(RTL_CONSTASCII_USTRINGPARAM("LocalSocket")) - ,OUString(RTL_CONSTASCII_USTRINGPARAM( - "The file path of a socket to connect to a local MySQL server.")) + OUString("LocalSocket") + ,OUString("The file path of a socket to connect to a local MySQL server.") ,sal_False ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString(RTL_CONSTASCII_USTRINGPARAM("NamedPipe")) - ,OUString(RTL_CONSTASCII_USTRINGPARAM( - "The name of a pipe to connect to a local MySQL server.")) + OUString("NamedPipe") + ,OUString("The name of a pipe to connect to a local MySQL server.") ,sal_False ,OUString() ,Sequence< OUString >()) |