diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 13:45:57 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-02 13:45:57 -0500 |
| commit | 0188ebf354cb2776f9d846a5f03b07f8bedf348e (patch) | |
| tree | 8344ddf70202669555ec7a07012357c87d36d765 /mysqlc/source/mysqlc_connection.cxx | |
| parent | 081dc5afdef4a84d60a57ff549f70071b1d26eda (diff) | |
targeted string re-work
Change-Id: I88cdf9d4c3faab75a80ff72e4268748296a09e50
Diffstat (limited to 'mysqlc/source/mysqlc_connection.cxx')
| -rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 9d9f1cc0d7a3..5a54eb6f1b6b 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -120,7 +120,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > sal_Int32 nIndex; sal_Bool bEmbedded = sal_False; OUString token; - OUString aHostName(RTL_CONSTASCII_USTRINGPARAM("localhost")); + OUString aHostName("localhost"); sal_Int32 nPort = 3306; OUString aDbName; @@ -130,7 +130,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > // parse url. Url has the following format: // external server: sdbc:mysqlc:[hostname]:[port]/[dbname] - if (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM(MYSQLC_URI_PREFIX)), sizeof(MYSQLC_URI_PREFIX)-1)) { + if (!url.compareTo(OUString(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) { nIndex = 12; } else { bEmbedded = sal_True; @@ -202,7 +202,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > } #ifndef SYSTEM_MYSQL - ::rtl::OUString sMySQLClientLib( RTL_CONSTASCII_USTRINGPARAM( MYSQL_LIB ) ); + ::rtl::OUString sMySQLClientLib( MYSQL_LIB ); ::rtl::OUString moduleBase; OSL_VERIFY( ::osl::Module::getUrlFromAddress( &thisModule, moduleBase ) ); @@ -250,7 +250,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > // Check if the server is 4.1 or above if (this->getMysqlVersion() < 40100) { throw SQLException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ) ), + ::rtl::OUString( "MySQL Connector/OO.org requires MySQL Server 4.1 or above" ), *this, ::rtl::OUString(), 0, @@ -764,9 +764,9 @@ sal_Int32 OConnection::getMysqlVersion() try { Sequence< Any > aArgs(1); Reference< XConnection> xCon = this; - aArgs[0] <<= NamedValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny(xCon)); + aArgs[0] <<= NamedValue(::rtl::OUString("ActiveConnection"), makeAny(xCon)); - m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.ParameterSubstitution")),aArgs),UNO_QUERY); + m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution"),aArgs),UNO_QUERY); } catch(const Exception&) {} } if ( m_xParameterSubstitution.is() ) { |