mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need for RTL_USING in addition to LIBO_INTERNAL_ONLY

Browse Source 
Change-Id: Iaa65658aed6bb4abb20a4d95dc9c6caf7c1c764b
This commit is contained in:
Stephan Bergmann 2014-12-19 11:43:51 +01:00
parent f9d3e0f57c
commit d5c86be04e
27 changed files with 360 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rtl/strbuf.hxx
View File

@ -992,7 +992,7 @@ typedef rtlunittest::OStringBuffer OStringBuffer;
#undef RTL_STRING_CONST_FUNCTION #undef RTL_STRING_CONST_FUNCTION
#endif #endif
#ifdef RTL_USING #ifdef LIBO_INTERNAL_ONLY
using ::rtl::OStringBuffer; using ::rtl::OStringBuffer;
#endif #endif

2
include/rtl/string.hxx
View File

@ -1752,7 +1752,7 @@ typedef rtlunittest::OString OString;
#undef RTL_STRING_CONST_FUNCTION #undef RTL_STRING_CONST_FUNCTION
#endif #endif
#ifdef RTL_USING #ifdef LIBO_INTERNAL_ONLY
using ::rtl::OString; using ::rtl::OString;
using ::rtl::OStringHash; using ::rtl::OStringHash;
using ::rtl::OStringLiteral; using ::rtl::OStringLiteral;

2
include/rtl/ustrbuf.hxx
View File

@ -1451,7 +1451,7 @@ typedef rtlunittest::OUStringBuffer OUStringBuffer;
} }
#endif #endif
#ifdef RTL_USING #ifdef LIBO_INTERNAL_ONLY
using ::rtl::OUStringBuffer; using ::rtl::OUStringBuffer;
#endif #endif

9
include/rtl/ustring.hxx
View File

@ -2593,11 +2593,10 @@ typedef rtlunittest::OUString OUString;
} }
#endif #endif
// RTL_USING is defined by gbuild for all modules except those with stable public API // In internal code, allow to use classes like OUString without having to
// (as listed in ure/source/README). It allows to use classes like OUString without // explicitly refer to the rtl namespace, which is kind of superfluous given
// having to explicitly refer to the rtl namespace, which is kind of superfluous // that OUString itself is namespaced by its OU prefix:
// given that OUString itself is namespaced by its OU prefix. #ifdef LIBO_INTERNAL_ONLY
#ifdef RTL_USING
using ::rtl::OUString; using ::rtl::OUString;
using ::rtl::OUStringHash; using ::rtl::OUStringHash;
using ::rtl::OStringToOUString; using ::rtl::OStringToOUString;

1
ios/shared/ios_sharedlo/objective_c/utils/MLOCommon.h
View File

@ -27,7 +27,6 @@ static const BOOL
#define IGNORE_ARG(X) ((void) X) #define IGNORE_ARG(X) ((void) X)
#define CPPU_ENV gcc3 #define CPPU_ENV gcc3
#define RTL_USING
#define HAVE_GCC_VISIBILITY_FEATURE #define HAVE_GCC_VISIBILITY_FEATURE
#import "time.h" #import "time.h"

80
mysqlc/source/mysqlc_connection.cxx
View File

@ -90,7 +90,7 @@ void SAL_CALL OConnection::release()
relase_ChildImpl(); relase_ChildImpl();
} }
void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) void OConnection::construct(const rtl::OUString& url, const Sequence< PropertyValue >& info)
throw(SQLException) throw(SQLException)
{ {
OSL_TRACE("OConnection::construct"); OSL_TRACE("OConnection::construct");
@ -98,10 +98,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
sal_Int32 nIndex; sal_Int32 nIndex;
bool bEmbedded = false; bool bEmbedded = false;
OUString token; rtl::OUString token;
OUString aHostName("localhost"); rtl::OUString aHostName("localhost");
sal_Int32 nPort = 3306; sal_Int32 nPort = 3306;
OUString aDbName; rtl::OUString aDbName;
m_settings.encoding = m_rDriver.getDefaultEncoding(); m_settings.encoding = m_rDriver.getDefaultEncoding();
m_settings.quoteIdentifier.clear(); m_settings.quoteIdentifier.clear();
@ -120,7 +120,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
token = url.getToken(0, '/', nIndex); token = url.getToken(0, '/', nIndex);
if (!token.isEmpty()) { if (!token.isEmpty()) {
sal_Int32 nIndex1 = 0; sal_Int32 nIndex1 = 0;
OUString hostandport = token.getToken(0,':', nIndex1); rtl::OUString hostandport = token.getToken(0,':', nIndex1);
if (!hostandport.isEmpty()) { if (!hostandport.isEmpty()) {
aHostName = hostandport; aHostName = hostandport;
hostandport = token.getToken(0, ':', nIndex1); hostandport = token.getToken(0, ':', nIndex1);
@ -137,7 +137,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
// get user and password for mysql connection // get user and password for mysql connection
const PropertyValue *pIter = info.getConstArray(); const PropertyValue *pIter = info.getConstArray();
const PropertyValue *pEnd = pIter + info.getLength(); const PropertyValue *pEnd = pIter + info.getLength();
OUString aUser, aPass, sUnixSocket, sNamedPipe; rtl::OUString aUser, aPass, sUnixSocket, sNamedPipe;
bool unixSocketPassed = false; bool unixSocketPassed = false;
bool namedPipePassed = false; bool namedPipePassed = false;
@ -163,20 +163,20 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
if (!bEmbedded) { if (!bEmbedded) {
try { try {
sql::ConnectOptionsMap connProps; sql::ConnectOptionsMap connProps;
std::string host_str = OUStringToOString(aHostName, m_settings.encoding).getStr(); std::string host_str = rtl::OUStringToOString(aHostName, m_settings.encoding).getStr();
std::string user_str = OUStringToOString(aUser, m_settings.encoding).getStr(); std::string user_str = rtl::OUStringToOString(aUser, m_settings.encoding).getStr();
std::string pass_str = OUStringToOString(aPass, m_settings.encoding).getStr(); std::string pass_str = rtl::OUStringToOString(aPass, m_settings.encoding).getStr();
std::string schema_str = OUStringToOString(aDbName, m_settings.encoding).getStr(); std::string schema_str = rtl::OUStringToOString(aDbName, m_settings.encoding).getStr();
connProps["hostName"] = sql::ConnectPropertyVal(host_str); connProps["hostName"] = sql::ConnectPropertyVal(host_str);
connProps["userName"] = sql::ConnectPropertyVal(user_str); connProps["userName"] = sql::ConnectPropertyVal(user_str);
connProps["password"] = sql::ConnectPropertyVal(pass_str); connProps["password"] = sql::ConnectPropertyVal(pass_str);
connProps["schema"] = sql::ConnectPropertyVal(schema_str); connProps["schema"] = sql::ConnectPropertyVal(schema_str);
connProps["port"] = sql::ConnectPropertyVal((int)(nPort)); connProps["port"] = sql::ConnectPropertyVal((int)(nPort));
if (unixSocketPassed) { if (unixSocketPassed) {
sql::SQLString socket_str = OUStringToOString(sUnixSocket, m_settings.encoding).getStr(); sql::SQLString socket_str = rtl::OUStringToOString(sUnixSocket, m_settings.encoding).getStr();
connProps["socket"] = socket_str; connProps["socket"] = socket_str;
} else if (namedPipePassed) { } else if (namedPipePassed) {
sql::SQLString pipe_str = OUStringToOString(sNamedPipe, m_settings.encoding).getStr(); sql::SQLString pipe_str = rtl::OUStringToOString(sNamedPipe, m_settings.encoding).getStr();
connProps["socket"] = pipe_str; connProps["socket"] = pipe_str;
} }
@ -195,14 +195,14 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
} }
m_settings.schema = aDbName; m_settings.schema = aDbName;
OSL_TRACE("%s", OUStringToOString(m_settings.schema, getConnectionEncoding()).getStr()); OSL_TRACE("%s", rtl::OUStringToOString(m_settings.schema, getConnectionEncoding()).getStr());
// Check if the server is 4.1 or above // Check if the server is 4.1 or above
if (this->getMysqlVersion() < 40100) { if (this->getMysqlVersion() < 40100) {
throw SQLException( throw SQLException(
"MariaDB LibreOffice Connector requires MySQL Server 4.1 or above", "MariaDB LibreOffice Connector requires MySQL Server 4.1 or above",
*this, *this,
OUString(), rtl::OUString(),
0, 0,
Any()); Any());
} }
@ -211,20 +211,20 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
stmt->executeUpdate("SET NAMES utf8"); stmt->executeUpdate("SET NAMES utf8");
} }
OUString OConnection::getImplementationName() throw (css::uno::RuntimeException, std::exception) rtl::OUString OConnection::getImplementationName() throw (css::uno::RuntimeException, std::exception)
{ {
return OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection"); return rtl::OUString("com.sun.star.sdbc.drivers.mysqlc.OConnection");
} }
css::uno::Sequence<OUString> OConnection::getSupportedServiceNames() css::uno::Sequence<rtl::OUString> OConnection::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
css::uno::Sequence<OUString> s(1); css::uno::Sequence<rtl::OUString> s(1);
s[0] = "com.sun.star.sdbc.Connection"; s[0] = "com.sun.star.sdbc.Connection";
return s; return s;
} }
sal_Bool OConnection::supportsService(OUString const & ServiceName) sal_Bool OConnection::supportsService(rtl::OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
return cppu::supportsService(this, ServiceName); return cppu::supportsService(this, ServiceName);
@ -250,20 +250,20 @@ Reference< XStatement > SAL_CALL OConnection::createStatement()
return xReturn; return xReturn;
} }
Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const OUString& _sSql) Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const rtl::OUString& _sSql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OConnection::prepareStatement"); OSL_TRACE("OConnection::prepareStatement");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed); checkDisposed(OConnection_BASE::rBHelper.bDisposed);
const OUString sSqlStatement = transFormPreparedStatement( _sSql ); const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
Reference< XPreparedStatement > xStatement; Reference< XPreparedStatement > xStatement;
try { try {
// create a statement // create a statement
// the statement can only be executed more than once // the statement can only be executed more than once
xStatement = new OPreparedStatement(this, xStatement = new OPreparedStatement(this,
m_settings.cppConnection->prepareStatement(OUStringToOString(sSqlStatement, getConnectionEncoding()).getStr())); m_settings.cppConnection->prepareStatement(rtl::OUStringToOString(sSqlStatement, getConnectionEncoding()).getStr()));
m_aStatements.push_back( WeakReferenceHelper( xStatement ) ); m_aStatements.push_back( WeakReferenceHelper( xStatement ) );
} catch (const sql::SQLException & e) { } catch (const sql::SQLException & e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
@ -271,7 +271,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement(const OUS
return xStatement; return xStatement;
} }
Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const OUString& /*_sSql*/ ) Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const rtl::OUString& /*_sSql*/ )
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OConnection::prepareCall"); OSL_TRACE("OConnection::prepareCall");
@ -282,14 +282,14 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall(const OUString
return Reference< XPreparedStatement >(); return Reference< XPreparedStatement >();
} }
OUString SAL_CALL OConnection::nativeSQL(const OUString& _sSql) rtl::OUString SAL_CALL OConnection::nativeSQL(const rtl::OUString& _sSql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OConnection::nativeSQL"); OSL_TRACE("OConnection::nativeSQL");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
const OUString sSqlStatement = transFormPreparedStatement( _sSql ); const rtl::OUString sSqlStatement = transFormPreparedStatement( _sSql );
OUString sNativeSQL; rtl::OUString sNativeSQL;
try { try {
sNativeSQL = mysqlc_sdbc_driver::convert(m_settings.cppConnection->nativeSQL(mysqlc_sdbc_driver::convert(sSqlStatement, getConnectionEncoding())), sNativeSQL = mysqlc_sdbc_driver::convert(m_settings.cppConnection->nativeSQL(mysqlc_sdbc_driver::convert(sSqlStatement, getConnectionEncoding())),
getConnectionEncoding()); getConnectionEncoding());
@ -408,7 +408,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly()
return (m_settings.readOnly); return (m_settings.readOnly);
} }
void SAL_CALL OConnection::setCatalog(const OUString& catalog) void SAL_CALL OConnection::setCatalog(const rtl::OUString& catalog)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OConnection::setCatalog"); OSL_TRACE("OConnection::setCatalog");
@ -416,21 +416,21 @@ void SAL_CALL OConnection::setCatalog(const OUString& catalog)
checkDisposed(OConnection_BASE::rBHelper.bDisposed); checkDisposed(OConnection_BASE::rBHelper.bDisposed);
try { try {
// m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr()); // m_settings.cppConnection->setCatalog(rtl::OUStringToOString(catalog, m_settings.encoding).getStr());
m_settings.cppConnection->setSchema(OUStringToOString(catalog, getConnectionEncoding()).getStr()); m_settings.cppConnection->setSchema(rtl::OUStringToOString(catalog, getConnectionEncoding()).getStr());
} catch (sql::SQLException & e) { } catch (sql::SQLException & e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding());
} }
} }
OUString SAL_CALL OConnection::getCatalog() rtl::OUString SAL_CALL OConnection::getCatalog()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OConnection::getCatalog"); OSL_TRACE("OConnection::getCatalog");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed); checkDisposed(OConnection_BASE::rBHelper.bDisposed);
OUString catalog; rtl::OUString catalog;
try { try {
catalog = mysqlc_sdbc_driver::convert(m_settings.cppConnection->getSchema(), getConnectionEncoding()); catalog = mysqlc_sdbc_driver::convert(m_settings.cppConnection->getSchema(), getConnectionEncoding());
} catch (const sql::SQLException & e) { } catch (const sql::SQLException & e) {
@ -583,15 +583,15 @@ void OConnection::disposing()
/* ToDo - upcast the connection to MySQL_Connection and use ::getSessionVariable() */ /* ToDo - upcast the connection to MySQL_Connection and use ::getSessionVariable() */
OUString OConnection::getMysqlVariable(const char *varname) rtl::OUString OConnection::getMysqlVariable(const char *varname)
throw(SQLException, RuntimeException) throw(SQLException, RuntimeException)
{ {
OSL_TRACE("OConnection::getMysqlVariable"); OSL_TRACE("OConnection::getMysqlVariable");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
checkDisposed(OConnection_BASE::rBHelper.bDisposed); checkDisposed(OConnection_BASE::rBHelper.bDisposed);
OUString ret; rtl::OUString ret;
OUStringBuffer aStatement; rtl::OUStringBuffer aStatement;
aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" ); aStatement.appendAscii( "SHOW SESSION VARIABLES LIKE '" );
aStatement.appendAscii( varname ); aStatement.appendAscii( varname );
aStatement.append( '\'' ); aStatement.append( '\'' );
@ -629,12 +629,12 @@ sal_Int32 OConnection::getMysqlVersion()
} }
// TODO: Not used // TODO: Not used
//sal_Int32 OConnection::sdbcColumnType(OUString typeName) //sal_Int32 OConnection::sdbcColumnType(rtl::OUString typeName)
//{ //{
// OSL_TRACE("OConnection::sdbcColumnType"); // OSL_TRACE("OConnection::sdbcColumnType");
// int i = 0; // int i = 0;
// while (mysqlc_types[i].typeName) { // while (mysqlc_types[i].typeName) {
// if (OUString::createFromAscii(mysqlc_types[i].typeName).equals( // if (rtl::OUString::createFromAscii(mysqlc_types[i].typeName).equals(
// typeName.toAsciiUpperCase())) // typeName.toAsciiUpperCase()))
// { // {
// return mysqlc_types[i].dataType; // return mysqlc_types[i].dataType;
@ -644,16 +644,16 @@ sal_Int32 OConnection::getMysqlVersion()
// return 0; // return 0;
//} //}
OUString OConnection::transFormPreparedStatement(const OUString& _sSQL) rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL)
{ {
OUString sSqlStatement = _sSQL; rtl::OUString sSqlStatement = _sSQL;
if ( !m_xParameterSubstitution.is() ) { if ( !m_xParameterSubstitution.is() ) {
try { try {
Sequence< Any > aArgs(1); Sequence< Any > aArgs(1);
Reference< XConnection> xCon = this; Reference< XConnection> xCon = this;
aArgs[0] <<= NamedValue(OUString("ActiveConnection"), makeAny(xCon)); aArgs[0] <<= NamedValue(rtl::OUString("ActiveConnection"), makeAny(xCon));
m_xParameterSubstitution.set(m_rDriver.getFactory()->createInstanceWithArguments(OUString("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&) {} } catch(const Exception&) {}
} }
if ( m_xParameterSubstitution.is() ) { if ( m_xParameterSubstitution.is() ) {

38
mysqlc/source/mysqlc_connection.hxx
View File

@ -74,9 +74,9 @@ namespace connectivity
{ {
rtl_TextEncoding encoding; rtl_TextEncoding encoding;
std::unique_ptr<sql::Connection> cppConnection; std::unique_ptr<sql::Connection> cppConnection;
OUString schema; rtl::OUString schema;
OUString quoteIdentifier; rtl::OUString quoteIdentifier;
OUString connectionURL; rtl::OUString connectionURL;
bool readOnly; bool readOnly;
}; };
@ -110,8 +110,8 @@ namespace connectivity
// for this Connection // for this Connection
SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation
OUString m_aURL; // URL of connection rtl::OUString m_aURL; // URL of connection
OUString m_sUser; // the user name rtl::OUString m_sUser; // the user name
MysqlCDriver& m_rDriver; // Pointer to the owning driver object MysqlCDriver& m_rDriver; // Pointer to the owning driver object
sql::Driver* cppDriver; sql::Driver* cppDriver;
@ -122,13 +122,13 @@ namespace connectivity
void buildTypeInfo() throw(SQLException); void buildTypeInfo() throw(SQLException);
public: public:
OUString getMysqlVariable(const char *varname) rtl::OUString getMysqlVariable(const char *varname)
throw(SQLException, RuntimeException); throw(SQLException, RuntimeException);
sal_Int32 getMysqlVersion() sal_Int32 getMysqlVersion()
throw(SQLException, RuntimeException); throw(SQLException, RuntimeException);
virtual void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) virtual void construct(const rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info)
throw(SQLException); throw(SQLException);
OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver); OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver);
@ -147,14 +147,14 @@ namespace connectivity
virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE;
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( virtual sal_Bool SAL_CALL supportsService(
OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
virtual css::uno::Sequence<OUString> SAL_CALL virtual css::uno::Sequence<rtl::OUString> SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
@ -162,13 +162,13 @@ namespace connectivity
my_XStatementRef SAL_CALL createStatement() my_XStatementRef SAL_CALL createStatement()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XPreparedStatementRef SAL_CALL prepareStatement(const OUString& sql) my_XPreparedStatementRef SAL_CALL prepareStatement(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
my_XPreparedStatementRef SAL_CALL prepareCall(const OUString& sql) my_XPreparedStatementRef SAL_CALL prepareCall(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL nativeSQL(const OUString& sql) rtl::OUString SAL_CALL nativeSQL(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setAutoCommit(sal_Bool autoCommit) void SAL_CALL setAutoCommit(sal_Bool autoCommit)
@ -195,10 +195,10 @@ namespace connectivity
sal_Bool SAL_CALL isReadOnly() sal_Bool SAL_CALL isReadOnly()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setCatalog(const OUString& catalog) void SAL_CALL setCatalog(const rtl::OUString& catalog)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getCatalog() rtl::OUString SAL_CALL getCatalog()
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setTransactionIsolation(sal_Int32 level) void SAL_CALL setTransactionIsolation(sal_Int32 level)
@ -222,19 +222,19 @@ namespace connectivity
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
// TODO: Not used // TODO: Not used
//sal_Int32 sdbcColumnType(OUString typeName); //sal_Int32 sdbcColumnType(rtl::OUString typeName);
inline const ConnectionSettings& getConnectionSettings() const { return m_settings; } inline const ConnectionSettings& getConnectionSettings() const { return m_settings; }
OUString transFormPreparedStatement(const OUString& _sSQL); rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL);
// should we use the catalog on filebased databases // should we use the catalog on filebased databases
inline bool isCatalogUsed() const { return m_bUseCatalog; } inline bool isCatalogUsed() const { return m_bUseCatalog; }
inline OUString getUserName() const { return m_sUser; } inline rtl::OUString getUserName() const { return m_sUser; }
inline const MysqlCDriver& getDriver() const { return m_rDriver;} inline const MysqlCDriver& getDriver() const { return m_rDriver;}
inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; }
}; /* OConnection */ }; /* OConnection */
// TODO: Not used. // TODO: Not used.
//inline OUString getPattern(OUString p) { return (p.getLength()) ? p : ASC2OU("%"); } //inline rtl::OUString getPattern(rtl::OUString p) { return (p.getLength()) ? p : ASC2OU("%"); }
} /* mysqlc */ } /* mysqlc */
} /* connectivity */ } /* connectivity */
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_CONNECTION_HXX

208
mysqlc/source/mysqlc_databasemetadata.cxx
View File

@ -97,10 +97,10 @@ ODatabaseMetaData::~ODatabaseMetaData()
OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData"); OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData");
} }
OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ) rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() )
{ {
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
OUString stringMetaData; rtl::OUString stringMetaData;
try { try {
stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) { } catch (const sql::MethodNotImplementedException &) {
@ -113,10 +113,10 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName,
return stringMetaData; return stringMetaData;
} }
OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ) rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() )
{ {
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
OUString stringMetaData; rtl::OUString stringMetaData;
try { try {
stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) { } catch (const sql::MethodNotImplementedException &) {
@ -129,10 +129,10 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName,
return stringMetaData; return stringMetaData;
} }
OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ) rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() )
{ {
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
OUString stringMetaData; rtl::OUString stringMetaData;
try { try {
stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) { } catch (const sql::MethodNotImplementedException &) {
@ -145,10 +145,10 @@ OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName,
return stringMetaData; return stringMetaData;
} }
OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ) rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() )
{ {
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName); OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
OUString stringMetaData; rtl::OUString stringMetaData;
try { try {
stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding()); stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) { } catch (const sql::MethodNotImplementedException &) {
@ -220,7 +220,7 @@ bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool
return impl_getBoolMetaData(_methodName, _Method, resultSetType); return impl_getBoolMetaData(_methodName, _Method, resultSetType);
} }
OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getCatalogSeparator", &sql::DatabaseMetaData::getCatalogSeparator); return impl_getStringMetaData("getCatalogSeparator", &sql::DatabaseMetaData::getCatalogSeparator);
@ -364,13 +364,13 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns()
return impl_getBoolMetaData("supportsNonNullableColumns", &sql::DatabaseMetaData::supportsNonNullableColumns); return impl_getBoolMetaData("supportsNonNullableColumns", &sql::DatabaseMetaData::supportsNonNullableColumns);
} }
OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getCatalogTerm", &sql::DatabaseMetaData::getCatalogTerm); return impl_getStringMetaData("getCatalogTerm", &sql::DatabaseMetaData::getCatalogTerm);
} }
OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
if (identifier_quote_string_set == false) { if (identifier_quote_string_set == false) {
@ -380,7 +380,7 @@ OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString()
return identifier_quote_string; return identifier_quote_string;
} }
OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters() rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getExtraNameCharacters", &sql::DatabaseMetaData::getExtraNameCharacters); return impl_getStringMetaData("getExtraNameCharacters", &sql::DatabaseMetaData::getExtraNameCharacters);
@ -787,53 +787,53 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL()
return impl_getBoolMetaData("supportsANSI92IntermediateSQL", &sql::DatabaseMetaData::supportsANSI92IntermediateSQL); return impl_getBoolMetaData("supportsANSI92IntermediateSQL", &sql::DatabaseMetaData::supportsANSI92IntermediateSQL);
} }
OUString SAL_CALL ODatabaseMetaData::getURL() rtl::OUString SAL_CALL ODatabaseMetaData::getURL()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getURL"); OSL_TRACE("ODatabaseMetaData::getURL");
return m_rConnection.getConnectionSettings().connectionURL; return m_rConnection.getConnectionSettings().connectionURL;
} }
OUString SAL_CALL ODatabaseMetaData::getUserName() rtl::OUString SAL_CALL ODatabaseMetaData::getUserName()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getUserName", &sql::DatabaseMetaData::getUserName); return impl_getStringMetaData("getUserName", &sql::DatabaseMetaData::getUserName);
} }
OUString SAL_CALL ODatabaseMetaData::getDriverName() rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getDriverName"); OSL_TRACE("ODatabaseMetaData::getDriverName");
OUString aValue( "MySQL Connector/OO.org" ); rtl::OUString aValue( "MySQL Connector/OO.org" );
return aValue; return aValue;
} }
OUString SAL_CALL ODatabaseMetaData::getDriverVersion() rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getDriverVersion"); OSL_TRACE("ODatabaseMetaData::getDriverVersion");
return OUString( "0.9.2" ); return rtl::OUString( "0.9.2" );
} }
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion() rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getDatabaseProductVersion", &sql::DatabaseMetaData::getDatabaseProductVersion); return impl_getStringMetaData("getDatabaseProductVersion", &sql::DatabaseMetaData::getDatabaseProductVersion);
} }
OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName() rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getDatabaseProductName", &sql::DatabaseMetaData::getDatabaseProductName); return impl_getStringMetaData("getDatabaseProductName", &sql::DatabaseMetaData::getDatabaseProductName);
} }
OUString SAL_CALL ODatabaseMetaData::getProcedureTerm() rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getProcedureTerm", &sql::DatabaseMetaData::getProcedureTerm); return impl_getStringMetaData("getProcedureTerm", &sql::DatabaseMetaData::getProcedureTerm);
} }
OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getSchemaTerm", &sql::DatabaseMetaData::getSchemaTerm); return impl_getStringMetaData("getSchemaTerm", &sql::DatabaseMetaData::getSchemaTerm);
@ -874,37 +874,37 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion()
return MARIADBC_VERSION_MINOR; return MARIADBC_VERSION_MINOR;
} }
OUString SAL_CALL ODatabaseMetaData::getSQLKeywords() rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getSQLKeywords", &sql::DatabaseMetaData::getSQLKeywords); return impl_getStringMetaData("getSQLKeywords", &sql::DatabaseMetaData::getSQLKeywords);
} }
OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape() rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getSearchStringEscape", &sql::DatabaseMetaData::getSearchStringEscape); return impl_getStringMetaData("getSearchStringEscape", &sql::DatabaseMetaData::getSearchStringEscape);
} }
OUString SAL_CALL ODatabaseMetaData::getStringFunctions() rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getStringFunctions", &sql::DatabaseMetaData::getStringFunctions); return impl_getStringMetaData("getStringFunctions", &sql::DatabaseMetaData::getStringFunctions);
} }
OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions() rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getTimeDateFunctions", &sql::DatabaseMetaData::getTimeDateFunctions); return impl_getStringMetaData("getTimeDateFunctions", &sql::DatabaseMetaData::getTimeDateFunctions);
} }
OUString SAL_CALL ODatabaseMetaData::getSystemFunctions() rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getSystemFunctions", &sql::DatabaseMetaData::getSystemFunctions); return impl_getStringMetaData("getSystemFunctions", &sql::DatabaseMetaData::getSystemFunctions);
} }
OUString SAL_CALL ODatabaseMetaData::getNumericFunctions() rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions()
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return impl_getStringMetaData("getNumericFunctions", &sql::DatabaseMetaData::getNumericFunctions); return impl_getStringMetaData("getNumericFunctions", &sql::DatabaseMetaData::getNumericFunctions);
@ -1199,19 +1199,19 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
const Any& catalog, const Any& catalog,
const OUString& schema, const rtl::OUString& schema,
const OUString& table, const rtl::OUString& table,
const OUString& columnNamePattern) const rtl::OUString& columnNamePattern)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getColumnPrivileges"); OSL_TRACE("ODatabaseMetaData::getColumnPrivileges");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), sch(rtl::OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()), tab(rtl::OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()),
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); cNamePattern(rtl::OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
boost::scoped_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild)); boost::scoped_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild));
@ -1239,18 +1239,18 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& catalog, const Any& catalog,
const OUString& schemaPattern, const rtl::OUString& schemaPattern,
const OUString& tableNamePattern, const rtl::OUString& tableNamePattern,
const OUString& columnNamePattern) const rtl::OUString& columnNamePattern)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getColumns"); OSL_TRACE("ODatabaseMetaData::getColumns");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), sPattern(rtl::OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()), tNamePattern(rtl::OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()),
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); cNamePattern(rtl::OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
boost::scoped_ptr< sql::ResultSet> rset( meta->getColumns(cat, boost::scoped_ptr< sql::ResultSet> rset( meta->getColumns(cat,
@ -1285,9 +1285,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
const Any& catalog, const Any& catalog,
const OUString& schemaPattern, const rtl::OUString& schemaPattern,
const OUString& tableNamePattern, const rtl::OUString& tableNamePattern,
const Sequence< OUString >& types ) const Sequence< rtl::OUString >& types )
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getTables"); OSL_TRACE("ODatabaseMetaData::getTables");
@ -1295,16 +1295,16 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
Reference< XResultSet > xResultSet(getOwnConnection(). Reference< XResultSet > xResultSet(getOwnConnection().
getDriver().getFactory()->createInstance( getDriver().getFactory()->createInstance(
OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY); rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet")),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), sPattern(rtl::OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); tNamePattern(rtl::OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
std::list<sql::SQLString> tabTypes; std::list<sql::SQLString> tabTypes;
for (const OUString *pStart = types.getConstArray(), *p = pStart, *pEnd = pStart + nLength; p != pEnd; ++p) { for (const rtl::OUString *pStart = types.getConstArray(), *p = pStart, *pEnd = pStart + nLength; p != pEnd; ++p) {
tabTypes.push_back(OUStringToOString(*p, m_rConnection.getConnectionEncoding()).getStr()); tabTypes.push_back(rtl::OUStringToOString(*p, m_rConnection.getConnectionEncoding()).getStr());
} }
try { try {
@ -1344,9 +1344,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
const Any& /* catalog */, const Any& /* catalog */,
const OUString& /* schemaPattern */, const rtl::OUString& /* schemaPattern */,
const OUString& /* procedureNamePattern */, const rtl::OUString& /* procedureNamePattern */,
const OUString& /* columnNamePattern */) const rtl::OUString& /* columnNamePattern */)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getProcedureColumns"); OSL_TRACE("ODatabaseMetaData::getProcedureColumns");
@ -1356,17 +1356,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
const Any& catalog, const Any& catalog,
const OUString& schemaPattern, const rtl::OUString& schemaPattern,
const OUString& procedureNamePattern) const rtl::OUString& procedureNamePattern)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getProcedures"); OSL_TRACE("ODatabaseMetaData::getProcedures");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), sPattern(rtl::OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr()); pNamePattern(rtl::OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
@ -1398,8 +1398,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
const Any& /* catalog */, const Any& /* catalog */,
const OUString& /* schema */, const rtl::OUString& /* schema */,
const OUString& /* table */) const rtl::OUString& /* table */)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getVersionColumns"); OSL_TRACE("ODatabaseMetaData::getVersionColumns");
@ -1411,16 +1411,16 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
const Any& catalog , const Any& catalog ,
const OUString& schema , const rtl::OUString& schema ,
const OUString& table ) const rtl::OUString& table )
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getExportedKeys"); OSL_TRACE("ODatabaseMetaData::getExportedKeys");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), sch(rtl::OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); tab(rtl::OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@ -1448,8 +1448,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
const Any& catalog, const Any& catalog,
const OUString& schema, const rtl::OUString& schema,
const OUString& table) const rtl::OUString& table)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getImportedKeys"); OSL_TRACE("ODatabaseMetaData::getImportedKeys");
@ -1457,9 +1457,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), sch(rtl::OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); tab(rtl::OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@ -1487,17 +1487,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
const Any& catalog, const Any& catalog,
const OUString& schema, const rtl::OUString& schema,
const OUString& table) const rtl::OUString& table)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getPrimaryKeys"); OSL_TRACE("ODatabaseMetaData::getPrimaryKeys");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), sch(rtl::OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); tab(rtl::OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@ -1525,8 +1525,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
const Any& catalog, const Any& catalog,
const OUString& schema, const rtl::OUString& schema,
const OUString& table, const rtl::OUString& table,
sal_Bool unique, sal_Bool unique,
sal_Bool approximate) sal_Bool approximate)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
@ -1535,9 +1535,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), sch(rtl::OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); tab(rtl::OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@ -1565,8 +1565,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
const Any& catalog, const Any& catalog,
const OUString& schema, const rtl::OUString& schema,
const OUString& table, const rtl::OUString& table,
sal_Int32 scope, sal_Int32 scope,
sal_Bool nullable) sal_Bool nullable)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
@ -1575,9 +1575,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), sch(rtl::OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()),
tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); tab(rtl::OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@ -1605,17 +1605,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
const Any& catalog, const Any& catalog,
const OUString& schemaPattern, const rtl::OUString& schemaPattern,
const OUString& tableNamePattern) const rtl::OUString& tableNamePattern)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getTablePrivileges"); OSL_TRACE("ODatabaseMetaData::getTablePrivileges");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string cat(catalog.hasValue()? rtl::OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""),
sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), sPattern(rtl::OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()),
tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); tPattern(rtl::OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
static bool fakeTablePrivileges = false; static bool fakeTablePrivileges = false;
@ -1632,7 +1632,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
aRow.push_back(makeAny( tableNamePattern )); // TABLE_NAME aRow.push_back(makeAny( tableNamePattern )); // TABLE_NAME
aRow.push_back(Any()); // GRANTOR aRow.push_back(Any()); // GRANTOR
aRow.push_back(userName); // GRANTEE aRow.push_back(userName); // GRANTEE
aRow.push_back(makeAny( OUString::createFromAscii( allPrivileges[i] ) )); // PRIVILEGE aRow.push_back(makeAny( rtl::OUString::createFromAscii( allPrivileges[i] ) )); // PRIVILEGE
aRow.push_back(Any()); // IS_GRANTABLE aRow.push_back(Any()); // IS_GRANTABLE
rRows.push_back(aRow); rRows.push_back(aRow);
@ -1664,23 +1664,23 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
const Any& primaryCatalog, const Any& primaryCatalog,
const OUString& primarySchema, const rtl::OUString& primarySchema,
const OUString& primaryTable, const rtl::OUString& primaryTable,
const Any& foreignCatalog, const Any& foreignCatalog,
const OUString& foreignSchema, const rtl::OUString& foreignSchema,
const OUString& foreignTable) const rtl::OUString& foreignTable)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("ODatabaseMetaData::getCrossReference"); OSL_TRACE("ODatabaseMetaData::getCrossReference");
Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance("org.openoffice.comp.helper.DatabaseMetaDataResultSet"),UNO_QUERY);
std::vector< std::vector< Any > > rRows; std::vector< std::vector< Any > > rRows;
std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), std::string primaryCat(primaryCatalog.hasValue()? rtl::OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""), foreignCat(foreignCatalog.hasValue()? rtl::OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""),
pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()), pSchema(rtl::OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()),
pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()), pTable(rtl::OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()),
fSchema(OUStringToOString(foreignSchema, m_rConnection.getConnectionEncoding()).getStr()), fSchema(rtl::OUStringToOString(foreignSchema, m_rConnection.getConnectionEncoding()).getStr()),
fTable(OUStringToOString(foreignTable, m_rConnection.getConnectionEncoding()).getStr()); fTable(rtl::OUStringToOString(foreignTable, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
@ -1708,8 +1708,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs(
const Any& /* catalog */, const Any& /* catalog */,
const OUString& /* schemaPattern */, const rtl::OUString& /* schemaPattern */,
const OUString& /* typeNamePattern */, const rtl::OUString& /* typeNamePattern */,
const Sequence< sal_Int32 >& /* types */) const Sequence< sal_Int32 >& /* types */)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {

74
mysqlc/source/mysqlc_databasemetadata.hxx
View File

@ -48,14 +48,14 @@ namespace connectivity
bool m_bUseCatalog; bool m_bUseCatalog;
protected: protected:
sql::DatabaseMetaData * meta; sql::DatabaseMetaData * meta;
OUString identifier_quote_string; rtl::OUString identifier_quote_string;
bool identifier_quote_string_set; bool identifier_quote_string_set;
private: private:
OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const std::string& (sql::DatabaseMetaData::*_Method)() );
OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, std::string (sql::DatabaseMetaData::*_Method)() );
OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() );
OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ); rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() );
sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() ); sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() );
bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() ); bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() );
bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg ); bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg );
@ -71,17 +71,17 @@ namespace connectivity
// XDatabaseMetaData // XDatabaseMetaData
sal_Bool SAL_CALL allProceduresAreCallable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL allProceduresAreCallable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL allTablesAreSelectable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL allTablesAreSelectable() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getURL() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getURL() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getUserName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getUserName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isReadOnly() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL isReadOnly() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedHigh() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL nullsAreSortedHigh() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedLow() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL nullsAreSortedLow() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedAtStart() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL nullsAreSortedAtStart() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getDatabaseProductName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getDatabaseProductName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getDatabaseProductVersion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getDatabaseProductVersion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getDriverName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getDriverName() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getDriverVersion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getDriverVersion() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDriverMajorVersion() throw(my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getDriverMajorVersion() throw(my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getDriverMinorVersion() throw(my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getDriverMinorVersion() throw(my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL usesLocalFiles() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL usesLocalFiles() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
@ -94,14 +94,14 @@ namespace connectivity
sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getIdentifierQuoteString() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getIdentifierQuoteString() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getSQLKeywords() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getSQLKeywords() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getNumericFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getNumericFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getStringFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getStringFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getSystemFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getSystemFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getTimeDateFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getTimeDateFunctions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getSearchStringEscape() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getSearchStringEscape() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getExtraNameCharacters() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getExtraNameCharacters() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsColumnAliasing() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsColumnAliasing() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
@ -130,11 +130,11 @@ namespace connectivity
sal_Bool SAL_CALL supportsOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsFullOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsFullOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getSchemaTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getSchemaTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getProcedureTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getProcedureTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getCatalogTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getCatalogTerm() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isCatalogAtStart() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL isCatalogAtStart() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getCatalogSeparator() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getCatalogSeparator() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
@ -190,23 +190,23 @@ namespace connectivity
sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& procedureNamePattern, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTables(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getTables(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< rtl::OUString >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getSchemas() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getSchemas() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getCatalogs() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getCatalogs() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTableTypes() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getTableTypes() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getColumns(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getColumns(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getColumnPrivileges(const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getColumnPrivileges(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, const rtl::OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTablePrivileges(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getTablePrivileges(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& tableNamePattern) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getBestRowIdentifier(const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getBestRowIdentifier(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Int32 scope, sal_Bool nullable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getVersionColumns(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getVersionColumns(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getPrimaryKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getPrimaryKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getImportedKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getImportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getExportedKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getExportedKeys(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getCrossReference(const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getCrossReference(const Any& primaryCatalog, const rtl::OUString& primarySchema, const rtl::OUString& primaryTable, const Any& foreignCatalog, const rtl::OUString& foreignSchema, const rtl::OUString& foreignTable) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getTypeInfo() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getTypeInfo() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getIndexInfo(const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getIndexInfo(const Any& catalog, const rtl::OUString& schema, const rtl::OUString& table, sal_Bool unique, sal_Bool approximate) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
@ -219,7 +219,7 @@ namespace connectivity
sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
my_XResultSetRef SAL_CALL getUDTs(const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; my_XResultSetRef SAL_CALL getUDTs(const Any& catalog, const rtl::OUString& schemaPattern, const rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types) throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException, std::exception) SAL_OVERRIDE;
}; };
} }

50
mysqlc/source/mysqlc_driver.cxx
View File

@ -72,38 +72,38 @@ void MysqlCDriver::disposing()
} }
// static ServiceInfo // static ServiceInfo
OUString MysqlCDriver::getImplementationName_Static() rtl::OUString MysqlCDriver::getImplementationName_Static()
throw(RuntimeException) throw(RuntimeException)
{ {
OSL_TRACE("MysqlCDriver::getImplementationName_Static"); OSL_TRACE("MysqlCDriver::getImplementationName_Static");
return OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" ); return rtl::OUString( "com.sun.star.comp.sdbc.mysqlc.MysqlCDriver" );
} }
Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() Sequence< rtl::OUString > MysqlCDriver::getSupportedServiceNames_Static()
throw(RuntimeException) throw(RuntimeException)
{ {
OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static"); OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static");
// which service is supported // which service is supported
// for more information @see com.sun.star.sdbc.Driver // for more information @see com.sun.star.sdbc.Driver
Sequence< OUString > aSNS(1); Sequence< rtl::OUString > aSNS(1);
aSNS[0] = "com.sun.star.sdbc.Driver"; aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS; return aSNS;
} }
OUString SAL_CALL MysqlCDriver::getImplementationName() rtl::OUString SAL_CALL MysqlCDriver::getImplementationName()
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
OSL_TRACE("MysqlCDriver::getImplementationName"); OSL_TRACE("MysqlCDriver::getImplementationName");
return getImplementationName_Static(); return getImplementationName_Static();
} }
sal_Bool SAL_CALL MysqlCDriver::supportsService(const OUString& _rServiceName) sal_Bool SAL_CALL MysqlCDriver::supportsService(const rtl::OUString& _rServiceName)
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
return cppu::supportsService(this, _rServiceName); return cppu::supportsService(this, _rServiceName);
} }
Sequence< OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames() Sequence< rtl::OUString > SAL_CALL MysqlCDriver::getSupportedServiceNames()
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
OSL_TRACE("MysqlCDriver::getSupportedServiceNames"); OSL_TRACE("MysqlCDriver::getSupportedServiceNames");
@ -120,7 +120,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
#ifdef BUNDLE_MARIADB #ifdef BUNDLE_MARIADB
if ( !m_bAttemptedLoadCConn ) if ( !m_bAttemptedLoadCConn )
{ {
const OUString sModuleName(BUNDLE_MARIADB); const rtl::OUString sModuleName(BUNDLE_MARIADB);
m_hCConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); m_hCConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
m_bAttemptedLoadCConn = true; m_bAttemptedLoadCConn = true;
} }
@ -132,7 +132,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
throw SQLException( throw SQLException(
"Unable to load the " BUNDLE_MARIADB " library.", "Unable to load the " BUNDLE_MARIADB " library.",
*this, *this,
OUString( "08001" ), // "unable to connect" rtl::OUString( "08001" ), // "unable to connect"
0, 0,
Any() Any()
); );
@ -140,7 +140,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
#endif #endif
if ( !m_bAttemptedLoadCppConn ) if ( !m_bAttemptedLoadCppConn )
{ {
const OUString sModuleName(CPPCONN_LIB); const rtl::OUString sModuleName(CPPCONN_LIB);
m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
m_bAttemptedLoadCppConn = true; m_bAttemptedLoadCppConn = true;
} }
@ -152,14 +152,14 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
throw SQLException( throw SQLException(
"Unable to load the " CPPCONN_LIB " library.", "Unable to load the " CPPCONN_LIB " library.",
*this, *this,
OUString( "08001" ), // "unable to connect" rtl::OUString( "08001" ), // "unable to connect"
0, 0,
Any() Any()
); );
} }
// find the factory symbol // find the factory symbol
const OUString sSymbolName = "sql_mysql_get_driver_instance"; const rtl::OUString sSymbolName = "sql_mysql_get_driver_instance";
typedef void* (* FGetMySQLDriver)(); typedef void* (* FGetMySQLDriver)();
const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) ); const FGetMySQLDriver pFactoryFunction = (FGetMySQLDriver)( osl_getFunctionSymbol( m_hCppConnModule, sSymbolName.pData ) );
@ -169,7 +169,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
throw SQLException( throw SQLException(
CPPCONN_LIB " is invalid: missing the driver factory function.", CPPCONN_LIB " is invalid: missing the driver factory function.",
*this, *this,
OUString( "08001" ), // "unable to connect" rtl::OUString( "08001" ), // "unable to connect"
0, 0,
Any() Any()
); );
@ -182,14 +182,14 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
throw SQLException( throw SQLException(
"Unable to obtain the MySQL_Driver instance from Connector/C++.", "Unable to obtain the MySQL_Driver instance from Connector/C++.",
*this, *this,
OUString( "08001" ), // "unable to connect" rtl::OUString( "08001" ), // "unable to connect"
0, 0,
Any() Any()
); );
} }
} }
Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, const Sequence< PropertyValue >& info) Reference< XConnection > SAL_CALL MysqlCDriver::connect(const rtl::OUString& url, const Sequence< PropertyValue >& info)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );
@ -222,14 +222,14 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con
return xConn; return xConn;
} }
sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url) sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const rtl::OUString& url)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("MysqlCDriver::acceptsURL"); OSL_TRACE("MysqlCDriver::acceptsURL");
return url.startsWith("sdbc:mysqlc:"); return url.startsWith("sdbc:mysqlc:");
} }
Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUString& url, const Sequence< PropertyValue >& /* info */) Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl::OUString& url, const Sequence< PropertyValue >& /* info */)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("MysqlCDriver::getPropertyInfo"); OSL_TRACE("MysqlCDriver::getPropertyInfo");
@ -237,18 +237,18 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUSt
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("Hostname") rtl::OUString("Hostname")
,OUString("Name of host") ,rtl::OUString("Name of host")
,sal_True ,sal_True
,OUString("localhost") ,rtl::OUString("localhost")
,Sequence< OUString >()) ,Sequence< rtl::OUString >())
); );
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("Port") rtl::OUString("Port")
,OUString("Port") ,rtl::OUString("Port")
,sal_True ,sal_True
,OUString("3306") ,rtl::OUString("3306")
,Sequence< OUString >()) ,Sequence< rtl::OUString >())
); );
return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
} }

16
mysqlc/source/mysqlc_driver.hxx
View File

@ -81,20 +81,20 @@ namespace connectivity
// OComponentHelper // OComponentHelper
void SAL_CALL disposing(void) SAL_OVERRIDE; void SAL_CALL disposing(void) SAL_OVERRIDE;
// XInterface // XInterface
static OUString getImplementationName_Static() throw(RuntimeException); static rtl::OUString getImplementationName_Static() throw(RuntimeException);
static Sequence< OUString > getSupportedServiceNames_Static() throw(RuntimeException); static Sequence< rtl::OUString > getSupportedServiceNames_Static() throw(RuntimeException);
// XServiceInfo // XServiceInfo
OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(RuntimeException, std::exception) SAL_OVERRIDE;
Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE;
// XDriver // XDriver
Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const rtl::OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL acceptsURL(const OUString& url) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL acceptsURL(const rtl::OUString& url) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const rtl::OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException, std::exception) SAL_OVERRIDE;

20
mysqlc/source/mysqlc_general.cxx
View File

@ -35,11 +35,11 @@ namespace mysqlc_sdbc_driver
void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException ) void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException) throw (SQLException)
{ {
const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + ": feature not implemented."; const rtl::OUString sMessage = rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ": feature not implemented.";
throw SQLException( throw SQLException(
sMessage, sMessage,
_rxContext, _rxContext,
OUString("HYC00"), rtl::OUString("HYC00"),
0, 0,
_pNextException ? *_pNextException : Any() _pNextException ? *_pNextException : Any()
); );
@ -48,11 +48,11 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException ) void throwInvalidArgumentException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
throw (SQLException) throw (SQLException)
{ {
const OUString sMessage = OUString::createFromAscii( _pAsciiFeatureName ) + ": invalid arguments."; const rtl::OUString sMessage = rtl::OUString::createFromAscii( _pAsciiFeatureName ) + ": invalid arguments.";
throw SQLException( throw SQLException(
sMessage, sMessage,
_rxContext, _rxContext,
OUString("HYC00"), rtl::OUString("HYC00"),
0, 0,
_pNextException ? *_pNextException : Any() _pNextException ? *_pNextException : Any()
); );
@ -69,9 +69,9 @@ void translateAndThrow(const ::sql::SQLException& _error, const ::com::sun::star
); );
} }
OUString getStringFromAny(const Any& _rAny) rtl::OUString getStringFromAny(const Any& _rAny)
{ {
OUString nReturn; rtl::OUString nReturn;
OSL_VERIFY( _rAny >>= nReturn ); OSL_VERIFY( _rAny >>= nReturn );
return nReturn; return nReturn;
} }
@ -147,14 +147,14 @@ int mysqlToOOOType(int cppConnType)
return com::sun::star::sdbc::DataType::VARCHAR; return com::sun::star::sdbc::DataType::VARCHAR;
} }
OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding) rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding)
{ {
return OUString( _string.c_str(), _string.size(), encoding ); return rtl::OUString( _string.c_str(), _string.size(), encoding );
} }
::std::string convert(const OUString& _string, const rtl_TextEncoding encoding) ::std::string convert(const rtl::OUString& _string, const rtl_TextEncoding encoding)
{ {
return ::std::string( OUStringToOString( _string, encoding ).getStr() ); return ::std::string( rtl::OUStringToOString( _string, encoding ).getStr() );
} }

6
mysqlc/source/mysqlc_general.hxx
View File

@ -29,7 +29,7 @@
namespace mysqlc_sdbc_driver namespace mysqlc_sdbc_driver
{ {
OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny); rtl::OUString getStringFromAny(const ::com::sun::star::uno::Any& _rAny);
void throwFeatureNotImplementedException( void throwFeatureNotImplementedException(
const sal_Char* _pAsciiFeatureName, const sal_Char* _pAsciiFeatureName,
@ -50,9 +50,9 @@ namespace mysqlc_sdbc_driver
int mysqlToOOOType(int mysqlType) throw (); int mysqlToOOOType(int mysqlType) throw ();
OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding); rtl::OUString convert(const ::std::string& _string, const rtl_TextEncoding encoding);
::std::string convert(const OUString& _string, const rtl_TextEncoding encoding); ::std::string convert(const rtl::OUString& _string, const rtl_TextEncoding encoding);
} }
#endif #endif

26
mysqlc/source/mysqlc_preparedstatement.cxx
View File

@ -57,21 +57,21 @@ static inline char * my_i_to_a(char * buf, size_t buf_size, int a)
return buf; return buf;
} }
OUString OPreparedStatement::getImplementationName() rtl::OUString OPreparedStatement::getImplementationName()
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
return OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement"); return rtl::OUString("com.sun.star.sdbcx.mysqlc.PreparedStatement");
} }
css::uno::Sequence<OUString> OPreparedStatement::getSupportedServiceNames() css::uno::Sequence<rtl::OUString> OPreparedStatement::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
css::uno::Sequence<OUString> s(1); css::uno::Sequence<rtl::OUString> s(1);
s[0] = "com.sun.star.sdbc.PreparedStatement"; s[0] = "com.sun.star.sdbc.PreparedStatement";
return s; return s;
} }
sal_Bool OPreparedStatement::supportsService(OUString const & ServiceName) sal_Bool OPreparedStatement::supportsService(rtl::OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
return cppu::supportsService(this, ServiceName); return cppu::supportsService(this, ServiceName);
@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate()
return affectedRows; return affectedRows;
} }
void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& x) void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const rtl::OUString& x)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OPreparedStatement::setString"); OSL_TRACE("OPreparedStatement::setString");
@ -211,7 +211,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString&
checkParameterIndex(parameter); checkParameterIndex(parameter);
try { try {
std::string stringie(OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr()); std::string stringie(rtl::OUStringToOString(x, m_pConnection->getConnectionEncoding()).getStr());
static_cast<sql::PreparedStatement *>(cppStatement)->setString(parameter, stringie); static_cast<sql::PreparedStatement *>(cppStatement)->setString(parameter, stringie);
} catch (const sql::MethodNotImplementedException &) { } catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this);
@ -230,19 +230,19 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection()
return m_pConnection; return m_pConnection;
} }
Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(const OUString& sql) Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return OCommonStatement::executeQuery( sql ); return OCommonStatement::executeQuery( sql );
} }
sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(const OUString& sql) sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return OCommonStatement::executeUpdate( sql ); return OCommonStatement::executeUpdate( sql );
} }
sal_Bool SAL_CALL OPreparedStatement::execute( const OUString& sql ) sal_Bool SAL_CALL OPreparedStatement::execute( const rtl::OUString& sql )
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
return OCommonStatement::execute( sql ); return OCommonStatement::execute( sql );
@ -674,7 +674,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
} }
} }
void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, const OUString& /* typeName */) void SAL_CALL OPreparedStatement::setObjectNull(sal_Int32 parameter, sal_Int32 /* sqlType */, const rtl::OUString& /* typeName */)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OPreparedStatement::setObjectNull"); OSL_TRACE("OPreparedStatement::setObjectNull");
@ -819,8 +819,8 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 column)
{ {
OSL_TRACE("OPreparedStatement::checkColumnIndex"); OSL_TRACE("OPreparedStatement::checkColumnIndex");
if (column < 1 || column > (sal_Int32) m_paramCount) { if (column < 1 || column > (sal_Int32) m_paramCount) {
OUString buf( "Parameter index out of range" ); rtl::OUString buf( "Parameter index out of range" );
throw SQLException(buf, *this, OUString(), 1, Any ()); throw SQLException(buf, *this, rtl::OUString(), 1, Any ());
} }
} }

16
mysqlc/source/mysqlc_preparedstatement.hxx
View File

@ -62,14 +62,14 @@ namespace connectivity
throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
virtual ~OPreparedStatement(); virtual ~OPreparedStatement();
public: public:
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( virtual sal_Bool SAL_CALL supportsService(
OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
virtual css::uno::Sequence<OUString> SAL_CALL virtual css::uno::Sequence<rtl::OUString> SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
@ -91,17 +91,17 @@ namespace connectivity
Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
// XStatement // XStatement
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const OUString& sql) ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL executeUpdate(const OUString& sql) sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL execute( const OUString& sql ) sal_Bool SAL_CALL execute( const rtl::OUString& sql )
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
// XParameters // XParameters
void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const OUString& typeName) void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const rtl::OUString& typeName)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
@ -118,7 +118,7 @@ namespace connectivity
void SAL_CALL setDouble(sal_Int32 parameter, double x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setDouble(sal_Int32 parameter, double x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setString(sal_Int32 parameter, const OUString& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL setString(sal_Int32 parameter, const rtl::OUString& x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;

6
mysqlc/source/mysqlc_propertyids.cxx
View File

@ -96,9 +96,9 @@ OPropertyMap::~OPropertyMap()
} }
} }
OUString OPropertyMap::getNameByIndex(sal_Int32 idx) const rtl::OUString OPropertyMap::getNameByIndex(sal_Int32 idx) const
{ {
OUString sRet; rtl::OUString sRet;
::std::map<sal_Int32 , rtl_uString*>::const_iterator aIter = m_aPropertyMap.find(idx); ::std::map<sal_Int32 , rtl_uString*>::const_iterator aIter = m_aPropertyMap.find(idx);
if (aIter == m_aPropertyMap.end()) { if (aIter == m_aPropertyMap.end()) {
sRet = const_cast<OPropertyMap*>(this)->fillValue(idx); sRet = const_cast<OPropertyMap*>(this)->fillValue(idx);
@ -168,7 +168,7 @@ static const property_callback property_callbacks[PROPERTY_ID_LAST] =
getPROPERTY_PRIVILEGES, getPROPERTY_PRIVILEGES,
}; };
OUString OPropertyMap::fillValue(sal_Int32 idx) rtl::OUString OPropertyMap::fillValue(sal_Int32 idx)
{ {
rtl_uString* pStr = NULL; rtl_uString* pStr = NULL;
rtl_uString_newFromAscii(&pStr, property_callbacks[idx]()); rtl_uString_newFromAscii(&pStr, property_callbacks[idx]());

6
mysqlc/source/mysqlc_propertyids.hxx
View File

@ -33,13 +33,13 @@ namespace mysqlc
{ {
::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap; ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap;
OUString fillValue(sal_Int32 _nIndex); rtl::OUString fillValue(sal_Int32 _nIndex);
public: public:
OPropertyMap() OPropertyMap()
{ {
} }
~OPropertyMap(); ~OPropertyMap();
OUString getNameByIndex(sal_Int32 _nIndex) const; rtl::OUString getNameByIndex(sal_Int32 _nIndex) const;
static OPropertyMap& getPropMap() static OPropertyMap& getPropMap()
{ {
@ -57,7 +57,7 @@ namespace mysqlc
sal_Int32 nLength; sal_Int32 nLength;
UStringDescription(PVFN _fCharFkt); UStringDescription(PVFN _fCharFkt);
operator OUString() const { return OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); } operator rtl::OUString() const { return rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); }
~UStringDescription(); ~UStringDescription();
private: private:
UStringDescription(); UStringDescription();

36
mysqlc/source/mysqlc_resultset.cxx
View File

@ -49,24 +49,24 @@ using ::osl::MutexGuard;
#include <stdio.h> #include <stdio.h>
OUString SAL_CALL OResultSet::getImplementationName() rtl::OUString SAL_CALL OResultSet::getImplementationName()
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSet::getImplementationName"); OSL_TRACE("OResultSet::getImplementationName");
return OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" ); return rtl::OUString( "com.sun.star.sdbcx.mysqlc.ResultSet" );
} }
Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() Sequence< rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames()
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSet::getSupportedServiceNames"); OSL_TRACE("OResultSet::getSupportedServiceNames");
Sequence< OUString > aSupported(2); Sequence< rtl::OUString > aSupported(2);
aSupported[0] = "com.sun.star.sdbc.ResultSet"; aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = "com.sun.star.sdbcx.ResultSet"; aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return (aSupported); return (aSupported);
} }
sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) sal_Bool SAL_CALL OResultSet::supportsService(const rtl::OUString& _rServiceName)
throw(RuntimeException, std::exception) throw(RuntimeException, std::exception)
{ {
return cppu::supportsService(this, _rServiceName); return cppu::supportsService(this, _rServiceName);
@ -128,7 +128,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes()
return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes()); return concatSequences(aTypes.getTypes(), OResultSet_BASE::getTypes());
} }
sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName) sal_Int32 SAL_CALL OResultSet::findColumn(const rtl::OUString& columnName)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSet::findColumn"); OSL_TRACE("OResultSet::findColumn");
@ -150,7 +150,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName)
throw SQLException( throw SQLException(
"The column name '" + columnName + "' is not valid.", "The column name '" + columnName + "' is not valid.",
*this, *this,
OUString("42S22"), rtl::OUString("42S22"),
0, 0,
Any() Any()
); );
@ -238,8 +238,8 @@ Date SAL_CALL OResultSet::getDate(sal_Int32 column)
Date d; Date d;
try { try {
OUString dateString = getString(column); rtl::OUString dateString = getString(column);
OUString token; rtl::OUString token;
sal_Int32 nIndex = 0, i=0; sal_Int32 nIndex = 0, i=0;
do { do {
@ -438,7 +438,7 @@ sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 column)
return 0; // fool compiler return 0; // fool compiler
} }
OUString SAL_CALL OResultSet::getString(sal_Int32 column) rtl::OUString SAL_CALL OResultSet::getString(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSet::getString"); OSL_TRACE("OResultSet::getString");
@ -450,14 +450,14 @@ OUString SAL_CALL OResultSet::getString(sal_Int32 column)
try { try {
sql::SQLString val = m_result->getString(column); sql::SQLString val = m_result->getString(column);
if (!m_result->wasNull()) { if (!m_result->wasNull()) {
return OUString( val.c_str(), val.length(), m_encoding ); return rtl::OUString( val.c_str(), val.length(), m_encoding );
} else { } else {
return OUString(); return rtl::OUString();
} }
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
Time SAL_CALL OResultSet::getTime(sal_Int32 column) Time SAL_CALL OResultSet::getTime(sal_Int32 column)
@ -469,8 +469,8 @@ Time SAL_CALL OResultSet::getTime(sal_Int32 column)
checkColumnIndex(column); checkColumnIndex(column);
Time t; Time t;
OUString timeString = getString(column); rtl::OUString timeString = getString(column);
OUString token; rtl::OUString token;
sal_Int32 nIndex, i=0; sal_Int32 nIndex, i=0;
nIndex = timeString.indexOf(' ') + 1; nIndex = timeString.indexOf(' ') + 1;
@ -922,7 +922,7 @@ void SAL_CALL OResultSet::updateDouble(sal_Int32 column, double /* x */)
mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDouble", *this); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::updateDouble", *this);
} }
void SAL_CALL OResultSet::updateString(sal_Int32 column, const OUString& /* x */) void SAL_CALL OResultSet::updateString(sal_Int32 column, const rtl::OUString& /* x */)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSet::updateString"); OSL_TRACE("OResultSet::updateString");
@ -1216,8 +1216,8 @@ void OResultSet::checkColumnIndex(sal_Int32 index)
OSL_TRACE("OResultSet::checkColumnIndex"); OSL_TRACE("OResultSet::checkColumnIndex");
if ((index < 1 || index > (int) fieldCount)) { if ((index < 1 || index > (int) fieldCount)) {
/* static object for efficiency or thread safety is a problem ? */ /* static object for efficiency or thread safety is a problem ? */
OUString buf( "index out of range" ); rtl::OUString buf( "index out of range" );
throw SQLException(buf, *this, OUString(), 1, Any()); throw SQLException(buf, *this, rtl::OUString(), 1, Any());
} }
} }

12
mysqlc/source/mysqlc_resultset.hxx
View File

@ -93,14 +93,14 @@ namespace connectivity
virtual ~OResultSet(); virtual ~OResultSet();
public: public:
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( virtual sal_Bool SAL_CALL supportsService(
OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
virtual css::uno::Sequence<OUString> SAL_CALL virtual css::uno::Sequence<rtl::OUString> SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
@ -159,7 +159,7 @@ namespace connectivity
// XRow // XRow
sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL getBoolean(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL getBoolean(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
@ -228,7 +228,7 @@ namespace connectivity
void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateString(sal_Int32 column, const OUString& x) void SAL_CALL updateString(sal_Int32 column, const rtl::OUString& x)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL updateBytes(sal_Int32 column, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) void SAL_CALL updateBytes(sal_Int32 column, const ::com::sun::star::uno::Sequence< sal_Int8 >& x)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
@ -248,7 +248,7 @@ namespace connectivity
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
// XColumnLocate // XColumnLocate
sal_Int32 SAL_CALL findColumn(const OUString& columnName) sal_Int32 SAL_CALL findColumn(const rtl::OUString& columnName)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
// XRowLocate // XRowLocate

32
mysqlc/source/mysqlc_resultsetmetadata.cxx
View File

@ -99,7 +99,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column)
return sal_False; // fool compiler return sal_False; // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getSchemaName"); OSL_TRACE("OResultSetMetaData::getSchemaName");
@ -112,10 +112,10 @@ OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column)
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getColumnName"); OSL_TRACE("OResultSetMetaData::getColumnName");
@ -128,10 +128,10 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column)
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getTableName"); OSL_TRACE("OResultSetMetaData::getTableName");
@ -144,10 +144,10 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column)
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getCatalogName"); OSL_TRACE("OResultSetMetaData::getCatalogName");
@ -160,10 +160,10 @@ OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column)
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getColumnTypeName"); OSL_TRACE("OResultSetMetaData::getColumnTypeName");
@ -176,10 +176,10 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column)
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getColumnLabel"); OSL_TRACE("OResultSetMetaData::getColumnLabel");
@ -192,16 +192,16 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column)
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding);
} }
return OUString(); // fool compiler return rtl::OUString(); // fool compiler
} }
OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OResultSetMetaData::getColumnServiceName"); OSL_TRACE("OResultSetMetaData::getColumnServiceName");
checkColumnIndex(column); checkColumnIndex(column);
OUString aRet = OUString(); rtl::OUString aRet = rtl::OUString();
return aRet; return aRet;
} }
@ -370,13 +370,13 @@ void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex)
OSL_TRACE("OResultSetMetaData::checkColumnIndex"); OSL_TRACE("OResultSetMetaData::checkColumnIndex");
if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) { if (columnIndex < 1 || columnIndex > (sal_Int32) meta->getColumnCount()) {
OUStringBuffer buf; rtl::OUStringBuffer buf;
buf.appendAscii( "Column index out of range (expected 1 to " ); buf.appendAscii( "Column index out of range (expected 1 to " );
buf.append( sal_Int32( meta->getColumnCount() ) ); buf.append( sal_Int32( meta->getColumnCount() ) );
buf.appendAscii( ", got " ); buf.appendAscii( ", got " );
buf.append( sal_Int32( columnIndex ) ); buf.append( sal_Int32( columnIndex ) );
buf.append( '.' ); buf.append( '.' );
throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() ); throw SQLException( buf.makeStringAndClear(), *this, rtl::OUString(), 1, Any() );
} }
} }

18
mysqlc/source/mysqlc_resultsetmetadata.hxx
View File

@ -51,9 +51,9 @@ namespace connectivity
{ {
} }
inline OUString convert( const ::std::string& _string ) const inline rtl::OUString convert( const ::std::string& _string ) const
{ {
return OUString( _string.c_str(), _string.size(), m_encoding ); return rtl::OUString( _string.c_str(), _string.size(), m_encoding );
} }
/// Avoid ambigous cast error from the compiler. /// Avoid ambigous cast error from the compiler.
@ -73,25 +73,25 @@ namespace connectivity
sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException); void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException);
}; };

12
mysqlc/source/mysqlc_services.cxx
View File

@ -34,9 +34,9 @@ using ::com::sun::star::lang::XMultiServiceFactory;
typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
( (
const Reference< XMultiServiceFactory > & rServiceManager, const Reference< XMultiServiceFactory > & rServiceManager,
const OUString & rComponentName, const rtl::OUString & rComponentName,
::cppu::ComponentInstantiation pCreateFunction, ::cppu::ComponentInstantiation pCreateFunction,
const Sequence< OUString > & rServiceNames, const Sequence< rtl::OUString > & rServiceNames,
rtl_ModuleCount* rtl_ModuleCount*
); );
@ -44,19 +44,19 @@ struct ProviderRequest
{ {
Reference< XSingleServiceFactory > xRet; Reference< XSingleServiceFactory > xRet;
Reference< XMultiServiceFactory > const xServiceManager; Reference< XMultiServiceFactory > const xServiceManager;
OUString const sImplementationName; rtl::OUString const sImplementationName;
ProviderRequest( ProviderRequest(
void* pServiceManager, void* pServiceManager,
sal_Char const* pImplementationName sal_Char const* pImplementationName
) : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager)) ) : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager))
, sImplementationName(OUString::createFromAscii(pImplementationName)) , sImplementationName(rtl::OUString::createFromAscii(pImplementationName))
{ {
} }
inline bool CREATE_PROVIDER( inline bool CREATE_PROVIDER(
const OUString& Implname, const rtl::OUString& Implname,
const Sequence< OUString > & Services, const Sequence< rtl::OUString > & Services,
::cppu::ComponentInstantiation Factory, ::cppu::ComponentInstantiation Factory,
createFactoryFunc creator createFactoryFunc creator
) )

32
mysqlc/source/mysqlc_statement.cxx
View File

@ -148,35 +148,35 @@ void SAL_CALL OStatement::clearBatch()
// if you support batches clear it here // if you support batches clear it here
} }
sal_Bool SAL_CALL OCommonStatement::execute(const OUString& sql) sal_Bool SAL_CALL OCommonStatement::execute(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OCommonStatement::execute"); OSL_TRACE("OCommonStatement::execute");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed); checkDisposed(rBHelper.bDisposed);
const OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql ); const rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement( sql );
bool success = false; bool success = false;
try { try {
success = cppStatement->execute(OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? sal_True:sal_False; success = cppStatement->execute(rtl::OUStringToOString(sSqlStatement, m_pConnection->getConnectionSettings().encoding).getStr())? sal_True:sal_False;
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
} }
return success; return success;
} }
Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const OUString& sql) Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OCommonStatement::executeQuery"); OSL_TRACE("OCommonStatement::executeQuery");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed); checkDisposed(rBHelper.bDisposed);
const OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql); const rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
Reference< XResultSet > xResultSet; Reference< XResultSet > xResultSet;
try { try {
std::unique_ptr< sql::ResultSet > rset(cppStatement->executeQuery(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr())); std::unique_ptr< sql::ResultSet > rset(cppStatement->executeQuery(rtl::OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr()));
xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding()); xResultSet = new OResultSet(this, rset.get(), m_pConnection->getConnectionEncoding());
rset.release(); rset.release();
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
@ -214,7 +214,7 @@ Any SAL_CALL OStatement::queryInterface(const Type & rType)
return (aRet); return (aRet);
} }
void SAL_CALL OStatement::addBatch(const OUString& sql) void SAL_CALL OStatement::addBatch(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OStatement::addBatch"); OSL_TRACE("OStatement::addBatch");
@ -235,17 +235,17 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch()
return aRet; return aRet;
} }
sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const OUString& sql) sal_Int32 SAL_CALL OCommonStatement::executeUpdate(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) throw(SQLException, RuntimeException, std::exception)
{ {
OSL_TRACE("OCommonStatement::executeUpdate"); OSL_TRACE("OCommonStatement::executeUpdate");
MutexGuard aGuard(m_aMutex); MutexGuard aGuard(m_aMutex);
checkDisposed(rBHelper.bDisposed); checkDisposed(rBHelper.bDisposed);
const OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql); const rtl::OUString sSqlStatement = m_pConnection->transFormPreparedStatement(sql);
sal_Int32 affectedRows = 0; sal_Int32 affectedRows = 0;
try { try {
affectedRows = cppStatement->executeUpdate(OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr()); affectedRows = cppStatement->executeUpdate(rtl::OUStringToOString(sSqlStatement, m_pConnection->getConnectionEncoding()).getStr());
} catch (const sql::SQLException &e) { } catch (const sql::SQLException &e) {
mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding());
} }
@ -310,7 +310,7 @@ void SAL_CALL OCommonStatement::clearWarnings()
Sequence< Property > aProps(10); Sequence< Property > aProps(10);
Property* pProperties = aProps.getArray(); Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0; sal_Int32 nPos = 0;
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<rtl::OUString>::get(), 0);
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0);
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0);
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0);
@ -384,20 +384,20 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con
} }
} }
OUString OStatement::getImplementationName() throw (css::uno::RuntimeException, std::exception) rtl::OUString OStatement::getImplementationName() throw (css::uno::RuntimeException, std::exception)
{ {
return OUString("com.sun.star.sdbcx.OStatement"); return rtl::OUString("com.sun.star.sdbcx.OStatement");
} }
css::uno::Sequence<OUString> OStatement::getSupportedServiceNames() css::uno::Sequence<rtl::OUString> OStatement::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
css::uno::Sequence<OUString> s(1); css::uno::Sequence<rtl::OUString> s(1);
s[0] = "com.sun.star.sdbc.Statement"; s[0] = "com.sun.star.sdbc.Statement";
return s; return s;
} }
sal_Bool OStatement::supportsService(OUString const & ServiceName) sal_Bool OStatement::supportsService(rtl::OUString const & ServiceName)
throw (css::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
return cppu::supportsService(this, ServiceName); return cppu::supportsService(this, ServiceName);

16
mysqlc/source/mysqlc_statement.hxx
View File

@ -71,7 +71,7 @@ namespace connectivity
SQLWarning m_aLastWarning; SQLWarning m_aLastWarning;
protected: protected:
::std::list< OUString> m_aBatchList; ::std::list< rtl::OUString> m_aBatchList;
OConnection* m_pConnection; // The owning Connection object OConnection* m_pConnection; // The owning Connection object
@ -123,13 +123,13 @@ namespace connectivity
throw(RuntimeException, std::exception) SAL_OVERRIDE; throw(RuntimeException, std::exception) SAL_OVERRIDE;
// XStatement // XStatement
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const OUString& sql) ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Int32 SAL_CALL executeUpdate(const OUString& sql) sal_Int32 SAL_CALL executeUpdate(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
sal_Bool SAL_CALL execute( const OUString& sql ) sal_Bool SAL_CALL execute( const rtl::OUString& sql )
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection()
@ -175,14 +175,14 @@ namespace connectivity
OStatement(OConnection* _pConnection, sql::Statement *_cppStatement) : OStatement(OConnection* _pConnection, sql::Statement *_cppStatement) :
OCommonStatement(_pConnection, _cppStatement) {} OCommonStatement(_pConnection, _cppStatement) {}
virtual OUString SAL_CALL getImplementationName() virtual rtl::OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( virtual sal_Bool SAL_CALL supportsService(
OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception) rtl::OUString const & ServiceName) throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
virtual css::uno::Sequence<OUString> SAL_CALL virtual css::uno::Sequence<rtl::OUString> SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
SAL_OVERRIDE; SAL_OVERRIDE;
@ -193,7 +193,7 @@ namespace connectivity
void SAL_CALL release() throw() SAL_OVERRIDE; void SAL_CALL release() throw() SAL_OVERRIDE;
// XBatchExecution // XBatchExecution
void SAL_CALL addBatch(const OUString& sql) void SAL_CALL addBatch(const rtl::OUString& sql)
throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;
void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE; void SAL_CALL clearBatch() throw(SQLException, RuntimeException, std::exception) SAL_OVERRIDE;

10
odk/qa/checkapi/checkapi.cxx
View File

@ -12,16 +12,6 @@
#error Build system problem, LIBO_INTERNAL_ONLY should not be set here. #error Build system problem, LIBO_INTERNAL_ONLY should not be set here.
#endif #endif
// The whole purpose of this test is to check that public API headers
// build even without RTL_USING (which enables using e.g. rtl::OUString
// without to refer to the rtl namespace, which is not wanted
// in public API). If there are build errors here, check the headers
// for uses of such types.
#ifdef RTL_USING
#error Build system problem, RTL_USING should not be set here.
#endif
// Additionally, check that public API headers build also with C++03. // Additionally, check that public API headers build also with C++03.
//#if __cplusplus >= 201103L //#if __cplusplus >= 201103L

2
sal/qa/rtl/textenc/rtl_textcvt.cxx
View File

@ -27,8 +27,6 @@
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#define RTL_USING
#include "rtl/string.hxx" #include "rtl/string.hxx"
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
#include "rtl/tencinfo.h" #include "rtl/tencinfo.h"

6
solenv/gbuild/LinkTarget.mk
View File

@ -386,10 +386,6 @@ endif
gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS) gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
define gb_LinkTarget_rtl_defs
$(if $(filter-out sal salhelper cppu cppuhelper odk, $(gb_Module_CURRENTMODULE_NAME)), -DRTL_USING)
endef
.PHONY : $(WORKDIR)/Clean/LinkTarget/% .PHONY : $(WORKDIR)/Clean/LinkTarget/%
$(WORKDIR)/Clean/LinkTarget/% : $(WORKDIR)/Clean/LinkTarget/% :
$(call gb_Output_announce,$*,$(false),LNK,4) $(call gb_Output_announce,$*,$(false),LNK,4)
@ -596,7 +592,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXX
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND := $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND :=
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND := $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND :=
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $$(call gb_LinkTarget_rtl_defs,$(1)) $(CPPFLAGS) $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call gb_LinkTarget__get_ldflags,$(2)) $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call gb_LinkTarget__get_ldflags,$(2))