From 6c4698ded0d859ea64e867745d6512301fd4bcfb Mon Sep 17 00:00:00 2001 From: Gert Faller Date: Mon, 6 Dec 2010 13:10:56 +0100 Subject: RTL_CONSTASCII_USTRINGPARAM in extensions 1 --- mysqlc/source/mysqlc_connection.cxx | 2 +- mysqlc/source/mysqlc_driver.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'mysqlc/source') diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index ac601e24465a..141ab7b3f863 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -135,7 +135,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::createFromAscii(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) { + if (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM(MYSQLC_URI_PREFIX)), sizeof(MYSQLC_URI_PREFIX)-1)) { nIndex = 12; } else { bEmbedded = sal_True; diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 6b77cd94b2e2..1dd1fdbf9dff 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -102,7 +102,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< OUString > aSNS(1); - aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver"); + aSNS[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); return aSNS; } /* }}} */ @@ -152,7 +152,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw() #else if ( !m_bAttemptedLoadCppConn ) { - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( CPPCONN_LIB ); + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB )); m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); m_bAttemptedLoadCppConn = true; } @@ -243,7 +243,7 @@ sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url) throw(SQLException, RuntimeException) { OSL_TRACE("MysqlCDriver::acceptsURL"); - return (!url.compareTo(OUString::createFromAscii("sdbc:mysqlc:"), sizeof("sdbc:mysqlc:")-1)); + return (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysqlc:")), sizeof("sdbc:mysqlc:")-1)); } /* }}} */ @@ -260,14 +260,14 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUSt OUString(RTL_CONSTASCII_USTRINGPARAM("Hostname")) ,OUString(RTL_CONSTASCII_USTRINGPARAM("Name of host")) ,sal_True - ,OUString::createFromAscii("localhost") + ,OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")) ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( OUString(RTL_CONSTASCII_USTRINGPARAM("Port")) ,OUString(RTL_CONSTASCII_USTRINGPARAM("Port")) ,sal_True - ,OUString::createFromAscii("3306") + ,OUString(RTL_CONSTASCII_USTRINGPARAM("3306")) ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); -- cgit