diff options
Diffstat (limited to 'mysqlc/source')
25 files changed, 547 insertions, 547 deletions
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml index 458ee6efb4d1..cc32c2531043 100755 --- a/mysqlc/source/description.xml +++ b/mysqlc/source/description.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" +<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink"> <identifier value="UPDATED_IDENTIFIER"/> - <version value="#VERSION#" /> + <version value="#VERSION#" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> <display-name> <name lang="en-US">#TITLE#</name> @@ -21,4 +21,4 @@ <extension-description> <src lang="#LANG#" xlink:href="description/description_#LANG#.txt"/> </extension-description> -</description> +</description> diff --git a/mysqlc/source/mysqlc.xml b/mysqlc/source/mysqlc.xml index 04e7d4ae708e..5c19802f162c 100644 --- a/mysqlc/source/mysqlc.xml +++ b/mysqlc/source/mysqlc.xml @@ -11,69 +11,69 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.sdbc.Driver </supported-service> - <service-dependency> ... </service-dependency> - </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <supported-service> com.sun.star.sdbc.Driver </supported-service> + <service-dependency> ... </service-dependency> + </component-description> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.util.XCancellable </type> - <type> com.sun.star.util.XNumberFormatter </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.beans.PropertyAttribute </type> - <type> com.sun.star.beans.XPropertyState </type> - <type> com.sun.star.beans.XPropertySet </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XMultiPropertySet </type> - <type> com.sun.star.beans.XFastPropertySet </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.lang.EventObject </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.DisposedException </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XUnoTunnel </type> - <type> com.sun.star.java.XJavaThreadRegister_11 </type> - <type> com.sun.star.java.XJavaVM </type> - <type> com.sun.star.sdbc.FetchDirection </type> - <type> com.sun.star.sdbc.XConnection </type> - <type> com.sun.star.sdbc.XStatement </type> - <type> com.sun.star.sdbc.XResultSet </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XWarningsSupplier </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbc.XMultipleResults </type> - <type> com.sun.star.sdbc.XBatchExecution </type> - <type> com.sun.star.sdbc.XPreparedBatchExecution </type> - <type> com.sun.star.sdbc.XParameters </type> - <type> com.sun.star.sdbc.XOutParameters </type> - <type> com.sun.star.sdbc.DriverPropertyInfo </type> - <type> com.sun.star.sdbc.SQLWarning </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.sdbc.ColumnSearch </type> - <type> com.sun.star.sdbc.ColumnValue </type> - <type> com.sun.star.sdbc.DataType </type> - <type> com.sun.star.sdbc.XDriver </type> - <type> com.sun.star.sdbc.TransactionIsolation </type> - <type> com.sun.star.sdbc.ResultSetType </type> - <type> com.sun.star.sdbc.ResultSetConcurrency </type> - <type> com.sun.star.sdbcx.XRowLocate </type> - <type> com.sun.star.sdbcx.XDeleteRows </type> - <type> com.sun.star.sdbcx.CompareBookmark </type> - <type> com.sun.star.sdb.XColumnUpdate </type> - <type> com.sun.star.sdb.XColumn </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.beans.PropertyAttribute </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XUnoTunnel </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.FetchDirection </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.SQLWarning </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdbc.ColumnSearch </type> + <type> com.sun.star.sdbc.ColumnValue </type> + <type> com.sun.star.sdbc.DataType </type> + <type> com.sun.star.sdbc.XDriver </type> + <type> com.sun.star.sdbc.TransactionIsolation </type> + <type> com.sun.star.sdbc.ResultSetType </type> + <type> com.sun.star.sdbc.ResultSetConcurrency </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.sdbcx.CompareBookmark </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> </module-description> diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index ac601e24465a..124d10861b1c 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ using ::rtl::OUString; /* {{{ OConnection::OConnection() -I- */ -OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) +OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) :OMetaConnection_BASE(m_aMutex) ,OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)&_rDriver, this) ,m_xMetaData(NULL) @@ -116,7 +116,7 @@ void SAL_CALL OConnection::release() #endif /* {{{ OConnection::construct() -I- */ -void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) +void OConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) { OSL_TRACE("OConnection::construct"); @@ -161,8 +161,8 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > } // get user and password for mysql connection - const PropertyValue *pIter = info.getConstArray(); - const PropertyValue *pEnd = pIter + info.getLength(); + const PropertyValue *pIter = info.getConstArray(); + const PropertyValue *pEnd = pIter + info.getLength(); OUString aUser, aPass, sUnixSocket, sNamedPipe; bool unixSocketPassed = false; bool namedPipePassed = false; @@ -402,7 +402,7 @@ void SAL_CALL OConnection::commit() m_settings.cppConnection->commit(); } catch (sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); - } + } } /* }}} */ @@ -475,7 +475,7 @@ void SAL_CALL OConnection::setReadOnly(sal_Bool readOnly) /* {{{ OConnection::createStatement() -I- */ sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException) -{ +{ OSL_TRACE("OConnection::isReadOnly"); MutexGuard aGuard(m_aMutex); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -495,11 +495,11 @@ void SAL_CALL OConnection::setCatalog(const OUString& catalog) checkDisposed(OConnection_BASE::rBHelper.bDisposed); try { -// m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr()); +// m_settings.cppConnection->setCatalog(OUStringToOString(catalog, m_settings.encoding).getStr()); m_settings.cppConnection->setSchema(OUStringToOString(catalog, getConnectionEncoding()).getStr()); } catch (sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); - } + } } /* }}} */ @@ -548,7 +548,7 @@ void SAL_CALL OConnection::setTransactionIsolation(sal_Int32 level) break; case TransactionIsolation::NONE: cpplevel = sql::TRANSACTION_SERIALIZABLE; - break; + break; default:; /* XXX: Exception ?? */ } @@ -571,16 +571,16 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation() try { switch (m_settings.cppConnection->getTransactionIsolation()) { - case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE; - case sql::TRANSACTION_REPEATABLE_READ: return TransactionIsolation::REPEATABLE_READ; - case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED; - case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED; + case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE; + case sql::TRANSACTION_REPEATABLE_READ: return TransactionIsolation::REPEATABLE_READ; + case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED; + case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED; default: ; } } catch (sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); - } + } return TransactionIsolation::NONE; } /* }}} */ @@ -683,8 +683,8 @@ void OConnection::disposing() } m_aStatements.clear(); - m_bClosed = sal_True; - m_xMetaData = WeakReference< XDatabaseMetaData >(); + m_bClosed = sal_True; + m_xMetaData = WeakReference< XDatabaseMetaData >(); dispose_ChildImpl(); OConnection_BASE::disposing(); @@ -710,14 +710,14 @@ OUString OConnection::getMysqlVariable(const char *varname) try { XStatement * stmt = new OStatement(this, m_settings.cppConnection->createStatement()); - Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() ); + Reference< XResultSet > rs = stmt->executeQuery( aStatement.makeStringAndClear() ); if (rs.is() && rs->next()) { Reference< XRow > xRow(rs, UNO_QUERY); ret = xRow->getString(2); } } catch (sql::SQLException & e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, getConnectionEncoding()); - } + } return ret; } @@ -749,17 +749,17 @@ sal_Int32 OConnection::getMysqlVersion() // TODO: Not used //sal_Int32 OConnection::sdbcColumnType(OUString typeName) //{ -// OSL_TRACE("OConnection::sdbcColumnType"); -// int i = 0; -// while (mysqlc_types[i].typeName) { -// if (OUString::createFromAscii(mysqlc_types[i].typeName).equals( -// typeName.toAsciiUpperCase())) -// { -// return mysqlc_types[i].dataType; -// } -// i++; -// } -// return 0; +// OSL_TRACE("OConnection::sdbcColumnType"); +// int i = 0; +// while (mysqlc_types[i].typeName) { +// if (OUString::createFromAscii(mysqlc_types[i].typeName).equals( +// typeName.toAsciiUpperCase())) +// { +// return mysqlc_types[i].dataType; +// } +// i++; +// } +// return 0; //} // ----------------------------------------------------------------------------- ::rtl::OUString OConnection::transFormPreparedStatement(const ::rtl::OUString& _sSQL) @@ -775,7 +775,7 @@ sal_Int32 OConnection::getMysqlVersion() } catch(const Exception&) {} } if ( m_xParameterSubstitution.is() ) { - try { + try { sSqlStatement = m_xParameterSubstitution->substituteVariables(sSqlStatement,sal_True); } catch(const Exception&) { } } diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 20f9ffac141c..ac3c4ccd79a2 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ namespace connectivity typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > my_XNameAccessRef; typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > my_XDatabaseMetaDataRef; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::lang::XServiceInfo > OMetaConnection_BASE; @@ -112,33 +112,33 @@ namespace connectivity ::com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_typeMap; ::com::sun::star::uno::Reference< com::sun::star::util::XStringSubstitution > m_xParameterSubstitution; protected: - + //==================================================================== // Data attributes //==================================================================== ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OWeakRefArray m_aStatements; // vector containing a list + OWeakRefArray m_aStatements; // vector containing a list // of all the Statement objects // for this Connection - SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation - OUString m_aURL; // URL of connection - OUString m_sUser; // the user name - MysqlCDriver& m_rDriver; // Pointer to the owning driver object + SQLWarning m_aLastWarning; // Last SQLWarning generated by an operation + OUString m_aURL; // URL of connection + OUString m_sUser; // the user name + MysqlCDriver& m_rDriver; // Pointer to the owning driver object sql::Driver* cppDriver; - sal_Bool m_bClosed; - sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases - sal_Bool m_bUseOldDateFormat; + sal_Bool m_bClosed; + sal_Bool m_bUseCatalog; // should we use the catalog on filebased databases + sal_Bool m_bUseOldDateFormat; - void buildTypeInfo() throw(SQLException); + void buildTypeInfo() throw(SQLException); public: OUString getMysqlVariable(const char *varname) throw(SQLException, RuntimeException); - sal_Int32 getMysqlVersion() + sal_Int32 getMysqlVersion() throw(SQLException, RuntimeException); virtual void construct(const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) @@ -147,7 +147,7 @@ namespace connectivity OConnection(MysqlCDriver& _rDriver, sql::Driver * cppDriver); virtual ~OConnection(); - void closeAllStatements () throw(SQLException); + void closeAllStatements () throw(SQLException); rtl_TextEncoding getConnectionEncoding() { return m_settings.encoding; } @@ -157,7 +157,7 @@ namespace connectivity virtual void SAL_CALL disposing(void); // XInterface - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw(); // XServiceInfo DECLARE_SERVICE_INFO(); @@ -228,12 +228,12 @@ namespace connectivity //sal_Int32 sdbcColumnType(OUString typeName); inline const ConnectionSettings& getConnectionSettings() const { return m_settings; } ::rtl::OUString transFormPreparedStatement(const ::rtl::OUString& _sSQL); - + // should we use the catalog on filebased databases - inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } - inline OUString getUserName() const { return m_sUser; } - inline const MysqlCDriver& getDriver() const { return m_rDriver;} - inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } + inline sal_Bool isCatalogUsed() const { return m_bUseCatalog; } + inline OUString getUserName() const { return m_sUser; } + inline const MysqlCDriver& getDriver() const { return m_rDriver;} + inline rtl_TextEncoding getTextEncoding() const { return m_settings.encoding; } }; /* OConnection */ // TODO: Not used. diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index a0ecf2ab854c..498ed77cd275 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -255,8 +255,8 @@ sal_Bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, { int resultSetType(sql::ResultSet::TYPE_FORWARD_ONLY); switch ( _resultSetType ) { - case ResultSetType::SCROLL_INSENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_INSENSITIVE; break; - case ResultSetType::SCROLL_SENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_SENSITIVE; break; + case ResultSetType::SCROLL_INSENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_INSENSITIVE; break; + case ResultSetType::SCROLL_SENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_SENSITIVE; break; } return impl_getBoolMetaData(_methodName, _Method, resultSetType); @@ -1200,10 +1200,10 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() OSL_TRACE("ODatabaseMetaData::getDefaultTransactionIsolation"); try { switch (meta->getDefaultTransactionIsolation()) { - case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE; - case sql::TRANSACTION_REPEATABLE_READ: return TransactionIsolation::REPEATABLE_READ; - case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED; - case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED; + case sql::TRANSACTION_SERIALIZABLE: return TransactionIsolation::SERIALIZABLE; + case sql::TRANSACTION_REPEATABLE_READ: return TransactionIsolation::REPEATABLE_READ; + case sql::TRANSACTION_READ_COMMITTED: return TransactionIsolation::READ_COMMITTED; + case sql::TRANSACTION_READ_UNCOMMITTED: return TransactionIsolation::READ_UNCOMMITTED; } } catch (sql::MethodNotImplementedException) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::getDriverMajorVersion", *this); @@ -1380,7 +1380,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT try { return meta->supportsResultSetConcurrency(setType, concurrency==com::sun::star::sdbc::TransactionIsolation::READ_COMMITTED? sql::TRANSACTION_READ_COMMITTED: - (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE? + (concurrency == com::sun::star::sdbc::TransactionIsolation::SERIALIZABLE? sql::TRANSACTION_SERIALIZABLE:sql::TRANSACTION_SERIALIZABLE))? sal_True:sal_False; } catch (sql::MethodNotImplementedException) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("ODatabaseMetaData::supportsResultSetConcurrency", *this); @@ -1658,7 +1658,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()), cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1690,17 +1690,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( /* {{{ ODatabaseMetaData::getColumns() -I- */ -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern, + const OUString& tableNamePattern, const OUString& columnNamePattern) throw(SQLException, RuntimeException) { OSL_TRACE("ODatabaseMetaData::getColumns"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tNamePattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()), cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -1739,9 +1739,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( /* {{{ ODatabaseMetaData::getTables() -I- */ -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& catalog, - const OUString& schemaPattern, + const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) @@ -1803,7 +1803,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( /* {{{ ODatabaseMetaData::getProcedureColumns() -I- */ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& /* catalog */, - const OUString& /* schemaPattern */, + const OUString& /* schemaPattern */, const OUString& /* procedureNamePattern */, const OUString& /* columnNamePattern */) throw(SQLException, RuntimeException) @@ -1830,7 +1830,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), pNamePattern(OUStringToOString(procedureNamePattern, m_rConnection.getConnectionEncoding()).getStr()); - + try { std::auto_ptr< sql::ResultSet> rset( meta->getProcedures(cat, sPattern.compare("")? sPattern:wild, @@ -1886,7 +1886,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( OSL_TRACE("ODatabaseMetaData::getExportedKeys"); Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -1928,7 +1928,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2012,7 +2012,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2043,7 +2043,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( /* {{{ ODatabaseMetaData::getBestRowIdentifier() -I- */ -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, @@ -2055,7 +2055,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sch(OUStringToOString(schema, m_rConnection.getConnectionEncoding()).getStr()), tab(OUStringToOString(table, m_rConnection.getConnectionEncoding()).getStr()); @@ -2096,7 +2096,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string cat(catalog.hasValue()? OUStringToOString(getStringFromAny(catalog), m_rConnection.getConnectionEncoding()).getStr():""), sPattern(OUStringToOString(schemaPattern, m_rConnection.getConnectionEncoding()).getStr()), tPattern(OUStringToOString(tableNamePattern, m_rConnection.getConnectionEncoding()).getStr()); @@ -2161,7 +2161,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( Reference< XResultSet > xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.helper.DatabaseMetaDataResultSet"))),UNO_QUERY); std::vector< std::vector< Any > > rRows; - ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), + ext_std::string primaryCat(primaryCatalog.hasValue()? OUStringToOString(getStringFromAny(primaryCatalog), m_rConnection.getConnectionEncoding()).getStr():""), foreignCat(foreignCatalog.hasValue()? OUStringToOString(getStringFromAny(foreignCatalog), m_rConnection.getConnectionEncoding()).getStr():""), pSchema(OUStringToOString(primarySchema, m_rConnection.getConnectionEncoding()).getStr()), pTable(OUStringToOString(primaryTable, m_rConnection.getConnectionEncoding()).getStr()), diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 3904df0cb04f..5b9941430cd3 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,12 +58,12 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaData_BASE { - OConnection& m_rConnection; - sal_Bool m_bUseCatalog; + OConnection& m_rConnection; + sal_Bool m_bUseCatalog; protected: sql::DatabaseMetaData * meta; - OUString identifier_quote_string; - bool identifier_quote_string_set; + OUString identifier_quote_string; + bool identifier_quote_string_set; private: OUString impl_getStringMetaData( const sal_Char* _methodName, const ext_std::string& (sql::DatabaseMetaData::*_Method)() ); @@ -83,127 +83,127 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - sal_Bool SAL_CALL allProceduresAreCallable() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL allTablesAreSelectable() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getURL() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getUserName() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL isReadOnly() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL nullsAreSortedHigh() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL nullsAreSortedLow() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL nullsAreSortedAtStart() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getDatabaseProductName() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getDatabaseProductVersion() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getDriverName() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getDriverVersion() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getDriverMajorVersion() throw(my_RuntimeException); - sal_Int32 SAL_CALL getDriverMinorVersion() throw(my_RuntimeException); - sal_Bool SAL_CALL usesLocalFiles() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL usesLocalFilePerTable() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL storesUpperCaseIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL storesLowerCaseIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL storesMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getIdentifierQuoteString() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getSQLKeywords() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getNumericFunctions() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getStringFunctions() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getSystemFunctions() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getTimeDateFunctions() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getSearchStringEscape() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getExtraNameCharacters() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsColumnAliasing() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL nullPlusNonNullIsNull() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsTypeConversion() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL allProceduresAreCallable() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL allTablesAreSelectable() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getURL() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getUserName() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL isReadOnly() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL nullsAreSortedHigh() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL nullsAreSortedLow() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL nullsAreSortedAtStart() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL nullsAreSortedAtEnd() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getDatabaseProductName() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getDatabaseProductVersion() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getDriverName() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getDriverVersion() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getDriverMajorVersion() throw(my_RuntimeException); + sal_Int32 SAL_CALL getDriverMinorVersion() throw(my_RuntimeException); + sal_Bool SAL_CALL usesLocalFiles() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL usesLocalFilePerTable() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL storesUpperCaseIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL storesLowerCaseIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL storesMixedCaseIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getIdentifierQuoteString() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getSQLKeywords() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getNumericFunctions() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getStringFunctions() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getSystemFunctions() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getTimeDateFunctions() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getSearchStringEscape() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getExtraNameCharacters() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsAlterTableWithAddColumn() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsAlterTableWithDropColumn() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsColumnAliasing() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL nullPlusNonNullIsNull() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsTypeConversion() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsConvert(sal_Int32 fromType, sal_Int32 toType) throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsTableCorrelationNames() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsTableCorrelationNames() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsDifferentTableCorrelationNames() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsExpressionsInOrderBy() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsOrderByUnrelated() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsGroupBy() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsGroupByUnrelated() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsGroupByBeyondSelect() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsLikeEscapeClause() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsMultipleResultSets() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsMultipleTransactions() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsNonNullableColumns() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsMinimumSQLGrammar() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsCoreSQLGrammar() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsExtendedSQLGrammar() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsANSI92IntermediateSQL() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsANSI92FullSQL() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsExpressionsInOrderBy() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsOrderByUnrelated() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsGroupBy() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsGroupByUnrelated() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsGroupByBeyondSelect() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsLikeEscapeClause() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsMultipleResultSets() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsMultipleTransactions() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsNonNullableColumns() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsMinimumSQLGrammar() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsCoreSQLGrammar() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsExtendedSQLGrammar() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsANSI92EntryLevelSQL() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsANSI92IntermediateSQL() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsANSI92FullSQL() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsIntegrityEnhancementFacility()throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsOuterJoins() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsFullOuterJoins() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getSchemaTerm() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getProcedureTerm() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getCatalogTerm() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL isCatalogAtStart() throw(my_SQLException, my_RuntimeException); - OUString SAL_CALL getCatalogSeparator() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsOuterJoins() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsFullOuterJoins() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsLimitedOuterJoins() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getSchemaTerm() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getProcedureTerm() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getCatalogTerm() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL isCatalogAtStart() throw(my_SQLException, my_RuntimeException); + OUString SAL_CALL getCatalogSeparator() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSchemasInDataManipulation() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSchemasInProcedureCalls() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSchemasInTableDefinitions() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSchemasInIndexDefinitions() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsCatalogsInDataManipulation() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsCatalogsInDataManipulation() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsCatalogsInProcedureCalls() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsCatalogsInTableDefinitions() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsPositionedDelete() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsPositionedUpdate() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSelectForUpdate() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsStoredProcedures() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSubqueriesInComparisons() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSubqueriesInExists() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSubqueriesInIns() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsCorrelatedSubqueries() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsUnion() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsUnionAll() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsPositionedDelete() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsPositionedUpdate() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSelectForUpdate() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsStoredProcedures() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSubqueriesInComparisons() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSubqueriesInExists() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSubqueriesInIns() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsSubqueriesInQuantifieds() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsCorrelatedSubqueries() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsUnion() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsUnionAll() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxBinaryLiteralLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxCharLiteralLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxColumnNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxColumnsInGroupBy() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxColumnsInIndex() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxColumnsInOrderBy() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxColumnsInSelect() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxColumnsInTable() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxConnections() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxCursorNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxIndexLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxSchemaNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxProcedureNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxCatalogNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxRowSize() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxStatementLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxStatements() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxTableNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxTablesInSelect() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getMaxUserNameLength() throw(my_SQLException, my_RuntimeException); - sal_Int32 SAL_CALL getDefaultTransactionIsolation() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL supportsTransactions() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxBinaryLiteralLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxCharLiteralLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxColumnNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxColumnsInGroupBy() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxColumnsInIndex() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxColumnsInOrderBy() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxColumnsInSelect() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxColumnsInTable() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxConnections() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxCursorNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxIndexLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxSchemaNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxProcedureNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxCatalogNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxRowSize() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxStatementLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxStatements() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxTableNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxTablesInSelect() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getMaxUserNameLength() throw(my_SQLException, my_RuntimeException); + sal_Int32 SAL_CALL getDefaultTransactionIsolation() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL supportsTransactions() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsTransactionIsolationLevel(sal_Int32 level) throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions() throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly()throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit() throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions() throw(my_SQLException, my_RuntimeException); my_XResultSetRef SAL_CALL getProcedures(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern) throw(my_SQLException, my_RuntimeException); my_XResultSetRef SAL_CALL getProcedureColumns(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern) throw(my_SQLException, my_RuntimeException); 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); @@ -223,15 +223,15 @@ namespace connectivity 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); sal_Bool SAL_CALL supportsResultSetType(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsResultSetConcurrency(sal_Int32 setType, sal_Int32 concurrency) throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL ownUpdatesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL ownDeletesAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL ownInsertsAreVisible(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL othersUpdatesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL othersDeletesAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL othersInsertsAreVisible(sal_Int32 setType)throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); - sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL updatesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL deletesAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); + sal_Bool SAL_CALL insertsAreDetected(sal_Int32 setType) throw(my_SQLException, my_RuntimeException); sal_Bool SAL_CALL supportsBatchUpdates() throw(my_SQLException, my_RuntimeException); 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); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(my_SQLException, my_RuntimeException); diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 6b77cd94b2e2..1d4d27890dc7 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ void MysqlCDriver::disposing() { OSL_TRACE("MysqlCDriver::disposing"); ::osl::MutexGuard aGuard(m_aMutex); - + // when driver will be destroied so all our connections have to be destroied as well for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { @@ -99,7 +99,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static() throw(RuntimeException) { OSL_TRACE("MysqlCDriver::getSupportedServiceNames_Static"); - // which service is supported + // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< OUString > aSNS(1); aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver"); @@ -231,7 +231,7 @@ Reference< XConnection > SAL_CALL MysqlCDriver::connect(const OUString& url, con } catch (sql::SQLException &e) { - mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding()); + mysqlc_sdbc_driver::translateAndThrow(e, *this, getDefaultEncoding()); } return xConn; } @@ -312,7 +312,7 @@ Reference< XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< X /* {{{ connectivity::mysqlc::release() -I- */ void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, - Reference< XInterface >& _xInterface, + Reference< XInterface >& _xInterface, ::com::sun::star::lang::XComponent* _pObject) { if (osl_decrementInterlockedCount(&_refCount) == 0) { diff --git a/mysqlc/source/mysqlc_driver.hxx b/mysqlc/source/mysqlc_driver.hxx index d3c367ad4549..3a17fd531425 100644 --- a/mysqlc/source/mysqlc_driver.hxx +++ b/mysqlc/source/mysqlc_driver.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace connectivity using ::com::sun::star::uno::Sequence; Reference< ::com::sun::star::uno::XInterface > SAL_CALL MysqlCDriver_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw(Exception); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; typedef void* (SAL_CALL * OMysqlCConnection_CreateInstanceFunction)(void* _pDriver); @@ -63,8 +63,8 @@ namespace connectivity { protected: Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - ::osl::Mutex m_aMutex; // mutex is need to control member access - OWeakRefArray m_xConnections; // vector containing a list + ::osl::Mutex m_aMutex; // mutex is need to control member access + OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver #ifndef SYSTEM_MYSQL_CPPCONN @@ -81,13 +81,13 @@ namespace connectivity // OComponentHelper void SAL_CALL disposing(void); // XInterface - static OUString getImplementationName_Static() throw(RuntimeException); - static Sequence< OUString > getSupportedServiceNames_Static() throw(RuntimeException); + static OUString getImplementationName_Static() throw(RuntimeException); + static Sequence< OUString > getSupportedServiceNames_Static() throw(RuntimeException); // XServiceInfo - OUString SAL_CALL getImplementationName() throw(RuntimeException); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException); - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); + OUString SAL_CALL getImplementationName() throw(RuntimeException); + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(RuntimeException); + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException); // XDriver Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) @@ -97,8 +97,8 @@ namespace connectivity Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo(const OUString& url, const Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException); - sal_Int32 SAL_CALL getMinorVersion() throw(RuntimeException); + sal_Int32 SAL_CALL getMajorVersion() throw(RuntimeException); + sal_Int32 SAL_CALL getMinorVersion() throw(RuntimeException); inline Reference< ::com::sun::star::lang::XMultiServiceFactory > getFactory() const { return m_xFactory; } diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx index e4fa7a58254c..03e1264d3cc1 100644 --- a/mysqlc/source/mysqlc_general.cxx +++ b/mysqlc/source/mysqlc_general.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,19 +129,19 @@ int mysqlToOOOType(int cppConnType) case sql::DataType::SET: case sql::DataType::VARCHAR: return com::sun::star::sdbc::DataType::VARCHAR; - + case sql::DataType::VARBINARY: return com::sun::star::sdbc::DataType::VARBINARY; case sql::DataType::LONGVARCHAR: return com::sun::star::sdbc::DataType::LONGVARCHAR; - + case sql::DataType::LONGVARBINARY: return com::sun::star::sdbc::DataType::LONGVARBINARY; case sql::DataType::TIMESTAMP: return com::sun::star::sdbc::DataType::TIMESTAMP; - + case sql::DataType::DATE: return com::sun::star::sdbc::DataType::DATE; @@ -150,7 +150,7 @@ int mysqlToOOOType(int cppConnType) case sql::DataType::GEOMETRY: return com::sun::star::sdbc::DataType::VARCHAR; - + case sql::DataType::SQLNULL: return com::sun::star::sdbc::DataType::SQLNULL; diff --git a/mysqlc/source/mysqlc_general.hxx b/mysqlc/source/mysqlc_general.hxx index 113301eaa666..5e4463bec38d 100644 --- a/mysqlc/source/mysqlc_general.hxx +++ b/mysqlc/source/mysqlc_general.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index f81865849450..89507b64b14d 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -146,7 +146,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() OSL_TRACE("OPreparedStatement::getMetaData"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); - + try { if (!m_xMetaData.is()) { m_xMetaData = new OResultSetMetaData( @@ -172,7 +172,7 @@ void SAL_CALL OPreparedStatement::close() MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); - + try { clearWarnings(); clearParameters(); @@ -213,7 +213,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() OSL_TRACE("OPreparedStatement::executeUpdate"); MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); - + sal_Int32 affectedRows = sal_False; try { affectedRows = ((sql::PreparedStatement *)cppStatement)->executeUpdate(); @@ -241,7 +241,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 parameter, const OUString& mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -311,7 +311,7 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 parameter, sal_Bool x) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBoolean", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -331,7 +331,7 @@ void SAL_CALL OPreparedStatement::setByte(sal_Int32 parameter, sal_Int8 x) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setByte", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -359,7 +359,7 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 parameter, const Date& aData mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDate", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -387,7 +387,7 @@ void SAL_CALL OPreparedStatement::setTime(sal_Int32 parameter, const Time& aVal) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTime", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -423,7 +423,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 parameter, const DateTi mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setTimestamp", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -443,7 +443,7 @@ void SAL_CALL OPreparedStatement::setDouble(sal_Int32 parameter, double x) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setDouble", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -463,7 +463,7 @@ void SAL_CALL OPreparedStatement::setFloat(sal_Int32 parameter, float x) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setFloat", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -483,7 +483,7 @@ void SAL_CALL OPreparedStatement::setInt(sal_Int32 parameter, sal_Int32 x) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setInt", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -503,7 +503,7 @@ void SAL_CALL OPreparedStatement::setLong(sal_Int32 parameter, sal_Int64 aVal) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setLong", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -523,7 +523,7 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 parameter, sal_Int32 sqlType mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setNull", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -792,7 +792,7 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 parameter, sal_Int16 x) mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setShort", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -806,14 +806,14 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 parameter, const Sequence< checkDisposed(OPreparedStatement::rBHelper.bDisposed); checkParameterIndex(parameter); - ext_std::string blobby((char *)x.getConstArray(), x.getLength()); + ext_std::string blobby((char *)x.getConstArray(), x.getLength()); try { ((sql::PreparedStatement *)cppStatement)->setString(parameter, blobby); } catch (sql::MethodNotImplementedException) { mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::setBytes", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ @@ -864,7 +864,7 @@ void SAL_CALL OPreparedStatement::clearParameters() mysqlc_sdbc_driver::throwFeatureNotImplementedException("OPreparedStatement::clearParameters", *this); } catch (sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_pConnection->getConnectionEncoding()); - } + } } /* }}} */ diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx index daf2610f996d..65d9492b76dd 100644 --- a/mysqlc/source/mysqlc_preparedstatement.hxx +++ b/mysqlc/source/mysqlc_preparedstatement.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,18 +55,18 @@ namespace connectivity using ::com::sun::star::sdbc::XResultSetMetaData; class OBoundParam; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XPreparedBatchExecution, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; - class OPreparedStatement : public OCommonStatement, + class OPreparedStatement : public OCommonStatement, public OPreparedStatement_BASE { protected: - unsigned int m_paramCount; // number of placeholders - sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement + unsigned int m_paramCount; // number of placeholders + sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement Reference< XResultSetMetaData > m_xMetaData; void checkParameterIndex(sal_Int32 parameter); @@ -80,7 +80,7 @@ namespace connectivity OPreparedStatement(OConnection* _pConnection, sql::PreparedStatement * cppPrepStmt); //XInterface - Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException); + Any SAL_CALL queryInterface(const Type & rType) throw(RuntimeException); void SAL_CALL acquire() throw(); void SAL_CALL release() throw(); @@ -89,7 +89,7 @@ namespace connectivity throw(RuntimeException); // XPreparedStatement - Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException); + Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery() throw(SQLException, RuntimeException); sal_Int32 SAL_CALL executeUpdate() throw(SQLException, RuntimeException); sal_Bool SAL_CALL execute() throw(SQLException, RuntimeException); Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection() throw(SQLException, RuntimeException); @@ -103,26 +103,26 @@ namespace connectivity throw(SQLException, RuntimeException); // XParameters - void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException); + void SAL_CALL setNull(sal_Int32 parameter, sal_Int32 sqlType) throw(SQLException, RuntimeException); void SAL_CALL setObjectNull(sal_Int32 parameter, sal_Int32 sqlType, const OUString& typeName) throw(SQLException, RuntimeException); - void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) throw(SQLException, RuntimeException); + void SAL_CALL setBoolean(sal_Int32 parameter, sal_Bool x) throw(SQLException, RuntimeException); - void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x) throw(SQLException, RuntimeException); + void SAL_CALL setByte(sal_Int32 parameter, sal_Int8 x) throw(SQLException, RuntimeException); - void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x) throw(SQLException, RuntimeException); + void SAL_CALL setShort(sal_Int32 parameter, sal_Int16 x) throw(SQLException, RuntimeException); - void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x) throw(SQLException, RuntimeException); + void SAL_CALL setInt(sal_Int32 parameter, sal_Int32 x) throw(SQLException, RuntimeException); - void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x) throw(SQLException, RuntimeException); + void SAL_CALL setLong(sal_Int32 parameter, sal_Int64 x) throw(SQLException, RuntimeException); - void SAL_CALL setFloat(sal_Int32 parameter, float x) throw(SQLException, RuntimeException); + void SAL_CALL setFloat(sal_Int32 parameter, float x) throw(SQLException, RuntimeException); - void SAL_CALL setDouble(sal_Int32 parameter, double x) throw(SQLException, RuntimeException); + void SAL_CALL setDouble(sal_Int32 parameter, double x) throw(SQLException, RuntimeException); - void SAL_CALL setString(sal_Int32 parameter, const OUString& x) throw(SQLException, RuntimeException); + void SAL_CALL setString(sal_Int32 parameter, const OUString& x) throw(SQLException, RuntimeException); void SAL_CALL setBytes(sal_Int32 parameter, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(SQLException, RuntimeException); @@ -141,7 +141,7 @@ namespace connectivity void SAL_CALL setCharacterStream(sal_Int32 parameter, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length) throw(SQLException, RuntimeException); - void SAL_CALL setObject(sal_Int32 parameter, const Any& x) throw(SQLException, RuntimeException); + void SAL_CALL setObject(sal_Int32 parameter, const Any& x) throw(SQLException, RuntimeException); void SAL_CALL setObjectWithInfo(sal_Int32 parameter, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw(SQLException, RuntimeException); @@ -163,7 +163,7 @@ namespace connectivity // XPreparedBatchExecution void SAL_CALL addBatch() throw(SQLException, RuntimeException); void SAL_CALL clearBatch() throw(SQLException, RuntimeException); - ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException); + ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException); // XCloseable void SAL_CALL close() throw(SQLException, RuntimeException); @@ -184,6 +184,6 @@ namespace connectivity * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/mysqlc/source/mysqlc_propertyids.cxx b/mysqlc/source/mysqlc_propertyids.cxx index 77cfa7b01b9e..ecd6e2b4a8f2 100644 --- a/mysqlc/source/mysqlc_propertyids.cxx +++ b/mysqlc/source/mysqlc_propertyids.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,64 +37,64 @@ namespace connectivity { namespace mysqlc { -const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } -const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } -const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } -const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } -const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } -const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } -const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } -const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } -const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } -const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } - -const sal_Char* getPROPERTY_NAME() { return "Name"; } -const sal_Char* getPROPERTY_TYPE() { return "Type"; } -const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } -const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } -const sal_Char* getPROPERTY_SCALE() { return "Scale"; } -const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } -const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } -const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } -const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } -const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } - -const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } -const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } -const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } -const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } -const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } -const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } -const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } -const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } -const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } -const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } -const sal_Char* getPROPERTY_COMMAND() { return "Command"; } -const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } -const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } -const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } - -const sal_Char* getSTAT_INVALID_INDEX() { return "Invalid descriptor index"; } - -const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } -const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } -const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } -const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } -const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } -const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } - -const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } -const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } - -const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } -const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } +const sal_Char* getPROPERTY_QUERYTIMEOUT() { return "QueryTimeOut"; } +const sal_Char* getPROPERTY_MAXFIELDSIZE() { return "MaxFieldSize"; } +const sal_Char* getPROPERTY_MAXROWS() { return "MaxRows"; } +const sal_Char* getPROPERTY_CURSORNAME() { return "CursorName"; } +const sal_Char* getPROPERTY_RESULTSETCONCURRENCY() { return "ResultSetConcurrency"; } +const sal_Char* getPROPERTY_RESULTSETTYPE() { return "ResultSetType"; } +const sal_Char* getPROPERTY_FETCHDIRECTION() { return "FetchDirection"; } +const sal_Char* getPROPERTY_FETCHSIZE() { return "FetchSize"; } +const sal_Char* getPROPERTY_ESCAPEPROCESSING() { return "EscapeProcessing"; } +const sal_Char* getPROPERTY_USEBOOKMARKS() { return "UseBookmarks"; } + +const sal_Char* getPROPERTY_NAME() { return "Name"; } +const sal_Char* getPROPERTY_TYPE() { return "Type"; } +const sal_Char* getPROPERTY_TYPENAME() { return "TypeName"; } +const sal_Char* getPROPERTY_PRECISION() { return "Precision"; } +const sal_Char* getPROPERTY_SCALE() { return "Scale"; } +const sal_Char* getPROPERTY_ISNULLABLE() { return "IsNullable"; } +const sal_Char* getPROPERTY_ISAUTOINCREMENT() { return "IsAutoIncrement"; } +const sal_Char* getPROPERTY_ISROWVERSION() { return "IsRowVersion"; } +const sal_Char* getPROPERTY_DESCRIPTION() { return "Description"; } +const sal_Char* getPROPERTY_DEFAULTVALUE() { return "DefaultValue"; } + +const sal_Char* getPROPERTY_REFERENCEDTABLE() { return "ReferencedTable"; } +const sal_Char* getPROPERTY_UPDATERULE() { return "UpdateRule"; } +const sal_Char* getPROPERTY_DELETERULE() { return "DeleteRule"; } +const sal_Char* getPROPERTY_CATALOG() { return "Catalog"; } +const sal_Char* getPROPERTY_ISUNIQUE() { return "IsUnique"; } +const sal_Char* getPROPERTY_ISPRIMARYKEYINDEX() { return "IsPrimaryKeyIndex"; } +const sal_Char* getPROPERTY_ISCLUSTERED() { return "IsClustered"; } +const sal_Char* getPROPERTY_ISASCENDING() { return "IsAscending"; } +const sal_Char* getPROPERTY_SCHEMANAME() { return "SchemaName"; } +const sal_Char* getPROPERTY_CATALOGNAME() { return "CatalogName"; } +const sal_Char* getPROPERTY_COMMAND() { return "Command"; } +const sal_Char* getPROPERTY_CHECKOPTION() { return "CheckOption"; } +const sal_Char* getPROPERTY_PASSWORD() { return "Password"; } +const sal_Char* getPROPERTY_RELATEDCOLUMN() { return "RelatedColumn"; } + +const sal_Char* getSTAT_INVALID_INDEX() { return "Invalid descriptor index"; } + +const sal_Char* getPROPERTY_FUNCTION() { return "Function"; } +const sal_Char* getPROPERTY_TABLENAME() { return "TableName"; } +const sal_Char* getPROPERTY_REALNAME() { return "RealName"; } +const sal_Char* getPROPERTY_DBASEPRECISIONCHANGED() { return "DbasePrecisionChanged"; } +const sal_Char* getPROPERTY_ISCURRENCY() { return "IsCurrency"; } +const sal_Char* getPROPERTY_ISBOOKMARKABLE() { return "IsBookmarkable"; } + +const sal_Char* getPROPERTY_FORMATKEY() { return "FormatKey"; } +const sal_Char* getPROPERTY_LOCALE() { return "Locale"; } + +const sal_Char* getPROPERTY_AUTOINCREMENTCREATION() { return "AutoIncrementCreation"; } +const sal_Char* getPROPERTY_PRIVILEGES() { return "Privileges"; } //============================================================ //= error messages //============================================================ -const sal_Char* getERRORMSG_SEQUENCE() { return "Function sequence error"; } -const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } -const sal_Char* getSQLSTATE_GENERAL() { return "HY0000"; } -const sal_Char* getSTR_DELIMITER() { return "/"; } +const sal_Char* getERRORMSG_SEQUENCE() { return "Function sequence error"; } +const sal_Char* getSQLSTATE_SEQUENCE() { return "HY010"; } +const sal_Char* getSQLSTATE_GENERAL() { return "HY0000"; } +const sal_Char* getSTR_DELIMITER() { return "/"; } diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx index 294ed509ee23..9fc802efdae4 100644 --- a/mysqlc/source/mysqlc_propertyids.hxx +++ b/mysqlc/source/mysqlc_propertyids.hxx @@ -18,7 +18,7 @@ namespace mysqlc { class OPropertyMap { - ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap; + ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap; ::rtl::OUString fillValue(sal_Int32 _nIndex); public: @@ -40,10 +40,10 @@ namespace mysqlc struct UStringDescription { - const sal_Char* pZeroTerminatedName; + const sal_Char* pZeroTerminatedName; sal_Int32 nLength; - UStringDescription(PVFN _fCharFkt); + UStringDescription(PVFN _fCharFkt); operator ::rtl::OUString() const { return ::rtl::OUString(pZeroTerminatedName,nLength,RTL_TEXTENCODING_ASCII_US); } ~UStringDescription(); private: @@ -121,13 +121,13 @@ enum #define DECL_PROP1IMPL(varname, type) \ pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)), //------------------------------------------------------------------------------ -#define DECL_PROP0(varname, type) \ +#define DECL_PROP0(varname, type) \ DECL_PROP1IMPL(varname, type) 0) //------------------------------------------------------------------------------ #define DECL_BOOL_PROP1IMPL(varname) \ pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(), //------------------------------------------------------------------------------ -#define DECL_BOOL_PROP0(varname) \ +#define DECL_BOOL_PROP0(varname) \ DECL_BOOL_PROP1IMPL(varname) 0) diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index c55744baa956..2898d12cf02e 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ using ::rtl::OUString; #include <stdio.h> -// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); +// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); /* {{{ OResultSet::getImplementationName() -I- */ OUString SAL_CALL OResultSet::getImplementationName() throw (RuntimeException) @@ -101,7 +101,7 @@ sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) /* {{{ OResultSet::OResultSet() -I- */ -OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding ) +OResultSet::OResultSet(OCommonStatement * pStmt, sql::ResultSet * result, rtl_TextEncoding _encoding ) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_aStatement((OWeakObject*)pStmt) @@ -162,7 +162,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes() throw(RuntimeException) { OSL_TRACE("OResultSet::getTypes"); - OTypeCollection aTypes( ::getCppuType((const Reference< XMultiPropertySet > *) NULL), + OTypeCollection aTypes( ::getCppuType((const Reference< XMultiPropertySet > *) NULL), ::getCppuType((const Reference< XFastPropertySet > *) NULL), ::getCppuType((const Reference< XPropertySet > *) NULL)); @@ -269,7 +269,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 column) throw(SQLException, RuntimeException) { OSL_TRACE("OResultSet::getBytes"); - + checkDisposed(OResultSet_BASE::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); @@ -861,7 +861,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() /* {{{ OResultSet::rowInserted() -I- */ sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException) -{ +{ OSL_TRACE("OResultSet::rowInserted"); MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1366,11 +1366,11 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } diff --git a/mysqlc/source/mysqlc_resultset.hxx b/mysqlc/source/mysqlc_resultset.hxx index 87cd76979ec0..981d0bd7b97a 100644 --- a/mysqlc/source/mysqlc_resultset.hxx +++ b/mysqlc/source/mysqlc_resultset.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,9 +62,9 @@ namespace connectivity typedef my_XNameAccessRef my_XNameAccessRef; /* - ** OResultSet + ** OResultSet */ - typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, + typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::util::XCancellable, @@ -77,16 +77,16 @@ namespace connectivity ::com::sun::star::sdbc::XColumnLocate, ::com::sun::star::lang::XServiceInfo> OResultSet_BASE; - class OResultSet : public OBase_Mutex, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public OPropertyArrayUsageHelper<OResultSet> + class OResultSet : public OBase_Mutex, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public OPropertyArrayUsageHelper<OResultSet> { protected: - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sql::ResultSet *m_result; - unsigned int fieldCount; + sql::ResultSet *m_result; + unsigned int fieldCount; rtl_TextEncoding m_encoding; // OPropertyArrayUsageHelper ::cppu::IPropertyArrayHelper* createArrayHelper() const; @@ -106,7 +106,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - + OResultSet( OCommonStatement* pStmt, sql::ResultSet *result, rtl_TextEncoding _encoding ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() @@ -121,9 +121,9 @@ namespace connectivity Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) throw(RuntimeException); - void SAL_CALL acquire() throw(); + void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); + void SAL_CALL release() throw(); //XTypeProvider ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() @@ -134,60 +134,60 @@ namespace connectivity throw(RuntimeException); // XResultSet - sal_Bool SAL_CALL next() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL next() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isBeforeFirst() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isBeforeFirst() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isAfterLast() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isAfterLast() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isFirst() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isFirst() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isLast() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isLast() throw(SQLException, RuntimeException); - void SAL_CALL beforeFirst() throw(SQLException, RuntimeException); + void SAL_CALL beforeFirst() throw(SQLException, RuntimeException); - void SAL_CALL afterLast() throw(SQLException, RuntimeException); + void SAL_CALL afterLast() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL first() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL first() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL last() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL last() throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getRow() throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL getRow() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL absolute(sal_Int32 row) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL absolute(sal_Int32 row) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL relative(sal_Int32 rows) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL relative(sal_Int32 rows) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL previous() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL previous() throw(SQLException, RuntimeException); - void SAL_CALL refreshRow() throw(SQLException, RuntimeException); + void SAL_CALL refreshRow() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL rowUpdated() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL rowUpdated() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL rowInserted() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL rowDeleted() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL rowDeleted() throw(SQLException, RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement() throw(SQLException, RuntimeException); // XRow sal_Bool SAL_CALL wasNull() throw(SQLException, RuntimeException); - OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getString(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL getBoolean(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL getBoolean(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int8 SAL_CALL getByte(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int16 SAL_CALL getShort(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int16 SAL_CALL getShort(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getInt(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL getInt(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int64 SAL_CALL getLong(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int64 SAL_CALL getLong(sal_Int32 column) throw(SQLException, RuntimeException); - float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException); + float SAL_CALL getFloat(sal_Int32 column) throw(SQLException, RuntimeException); - double SAL_CALL getDouble(sal_Int32 column) throw(SQLException, RuntimeException); + double SAL_CALL getDouble(sal_Int32 column) throw(SQLException, RuntimeException); ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes(sal_Int32 column) throw(SQLException, RuntimeException); @@ -227,45 +227,45 @@ namespace connectivity throw(SQLException, RuntimeException); // XCancellable - void SAL_CALL cancel() throw(RuntimeException); + void SAL_CALL cancel() throw(RuntimeException); // XCloseable - void SAL_CALL close() throw(SQLException, RuntimeException); + void SAL_CALL close() throw(SQLException, RuntimeException); // XWarningsSupplier - Any SAL_CALL getWarnings() throw(SQLException, RuntimeException); + Any SAL_CALL getWarnings() throw(SQLException, RuntimeException); - void SAL_CALL clearWarnings() throw(SQLException, RuntimeException); + void SAL_CALL clearWarnings() throw(SQLException, RuntimeException); // XResultSetUpdate - void SAL_CALL insertRow() throw(SQLException, RuntimeException); + void SAL_CALL insertRow() throw(SQLException, RuntimeException); - void SAL_CALL updateRow() throw(SQLException, RuntimeException); + void SAL_CALL updateRow() throw(SQLException, RuntimeException); - void SAL_CALL deleteRow() throw(SQLException, RuntimeException); + void SAL_CALL deleteRow() throw(SQLException, RuntimeException); - void SAL_CALL cancelRowUpdates() throw(SQLException, RuntimeException); + void SAL_CALL cancelRowUpdates() throw(SQLException, RuntimeException); - void SAL_CALL moveToInsertRow() throw(SQLException, RuntimeException); + void SAL_CALL moveToInsertRow() throw(SQLException, RuntimeException); - void SAL_CALL moveToCurrentRow() throw(SQLException, RuntimeException); + void SAL_CALL moveToCurrentRow() throw(SQLException, RuntimeException); // XRowUpdate - void SAL_CALL updateNull(sal_Int32 column) throw(SQLException, RuntimeException); + void SAL_CALL updateNull(sal_Int32 column) throw(SQLException, RuntimeException); - void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) throw(SQLException, RuntimeException); + void SAL_CALL updateBoolean(sal_Int32 column, sal_Bool x) throw(SQLException, RuntimeException); - void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) throw(SQLException, RuntimeException); + void SAL_CALL updateByte(sal_Int32 column, sal_Int8 x) throw(SQLException, RuntimeException); - void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) throw(SQLException, RuntimeException); + void SAL_CALL updateShort(sal_Int32 column, sal_Int16 x) throw(SQLException, RuntimeException); - void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) throw(SQLException, RuntimeException); + void SAL_CALL updateInt(sal_Int32 column, sal_Int32 x) throw(SQLException, RuntimeException); - void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) throw(SQLException, RuntimeException); + void SAL_CALL updateLong(sal_Int32 column, sal_Int64 x) throw(SQLException, RuntimeException); - void SAL_CALL updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException); + void SAL_CALL updateFloat(sal_Int32 column, float x) throw(SQLException, RuntimeException); - void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException); + void SAL_CALL updateDouble(sal_Int32 column, double x) throw(SQLException, RuntimeException); void SAL_CALL updateString(sal_Int32 column, const OUString& x) throw(SQLException, RuntimeException); @@ -299,7 +299,7 @@ namespace connectivity throw(SQLException, RuntimeException); // XRowLocate - Any SAL_CALL getBookmark() throw(SQLException, RuntimeException); + Any SAL_CALL getBookmark() throw(SQLException, RuntimeException); sal_Bool SAL_CALL moveToBookmark(const Any& bookmark) throw(SQLException, RuntimeException); @@ -310,7 +310,7 @@ namespace connectivity sal_Int32 SAL_CALL compareBookmarks(const Any& first, const Any& second) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL hasOrderedBookmarks() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL hasOrderedBookmarks() throw(SQLException, RuntimeException); sal_Int32 SAL_CALL hashBookmark(const Any& bookmark) throw(SQLException, RuntimeException); diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index 933bc7d57e98..7078033da440 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) /* XXX: This method doesn't throw exceptions at all. Should it declare that it throws ?? What if throw() is removed? - Does it change the API, the open-close principle? + Does it change the API, the open-close principle? */ /* {{{ OResultSetMetaData::getColumnCount() -I- */ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx b/mysqlc/source/mysqlc_resultsetmetadata.hxx index 93bc107fd455..e9bad5ffd6ea 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.hxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,49 +74,49 @@ namespace connectivity inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() { return this; } - sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL getColumnCount() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isSearchable(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isSearchable(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isCurrency(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isCurrency(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL isNullable(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL isNullable(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isSigned(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isSigned(sal_Int32 column) throw(SQLException, RuntimeException); sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column)throw(SQLException, RuntimeException); - OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getColumnName(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getSchemaName(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL getPrecision(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL getScale(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getTableName(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getCatalogName(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Int32 SAL_CALL getColumnType(sal_Int32 column) throw(SQLException, RuntimeException); - OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException); + OUString SAL_CALL getColumnTypeName(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isReadOnly(sal_Int32 column) throw(SQLException, RuntimeException); - sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException); + sal_Bool SAL_CALL isWritable(sal_Int32 column) throw(SQLException, RuntimeException); sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)throw(SQLException, RuntimeException); OUString SAL_CALL getColumnServiceName(sal_Int32 column)throw(SQLException, RuntimeException); - void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException); + void checkColumnIndex(sal_Int32 columnIndex) throw (SQLException, RuntimeException); }; } } diff --git a/mysqlc/source/mysqlc_services.cxx b/mysqlc/source/mysqlc_services.cxx index 4111870f874c..fea6bd1c446f 100644 --- a/mysqlc/source/mysqlc_services.cxx +++ b/mysqlc/source/mysqlc_services.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ using ::com::sun::star::lang::XMultiServiceFactory; typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) ( const Reference< XMultiServiceFactory > & rServiceManager, - const OUString & rComponentName, + const OUString & rComponentName, ::cppu::ComponentInstantiation pCreateFunction, const Sequence< OUString > & rServiceNames, rtl_ModuleCount* _pTemp @@ -59,8 +59,8 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) //--------------------------------------------------------------------------------------- void REGISTER_PROVIDER( - const OUString& aServiceImplName, - const Sequence< OUString>& Services, + const OUString& aServiceImplName, + const Sequence< OUString>& Services, const Reference< XRegistryKey > & xKey) { ::rtl::OUStringBuffer aMainKeyName; @@ -94,7 +94,7 @@ struct ProviderRequest /* {{{ CREATE_PROVIDER -I- */ inline sal_Bool CREATE_PROVIDER( - const OUString& Implname, + const OUString& Implname, const Sequence< OUString > & Services, ::cppu::ComponentInstantiation Factory, createFactoryFunc creator @@ -116,8 +116,8 @@ struct ProviderRequest /* {{{ component_getImplementationEnvironment -I- */ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /* ppEnv */ + const sal_Char **ppEnvTypeName, + uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -129,11 +129,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void * /* pServiceManager */, void * pRegistryKey) { if (pRegistryKey) { - try { + try { Reference< XRegistryKey > xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey)); REGISTER_PROVIDER( - MysqlCDriver::getImplementationName_Static(), + MysqlCDriver::getImplementationName_Static(), MysqlCDriver::getSupportedServiceNames_Static(), xKey); return sal_True; diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 64a06e6fde34..902edc10b0d8 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ using ::rtl::OUString; #include <stdio.h> /* {{{ OConnection::OCommonStatement() -I- */ -OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement) +OCommonStatement::OCommonStatement(OConnection* _pConnection, sql::Statement *_cppStatement) :OCommonStatement_IBase(m_aMutex) ,OPropertySetHelper(OCommonStatement_IBase::rBHelper) ,OStatement_CBase( (::cppu::OWeakObject*)_pConnection, this ) @@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes() throw(RuntimeException) { OSL_TRACE("OCommonStatement::getTypes"); - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -163,7 +163,7 @@ void SAL_CALL OCommonStatement::close() { OSL_TRACE("OCommonStatement::close"); /* - We need a block for the checkDisposed call. + We need a block for the checkDisposed call. After the check we can call dispose() as we are not under lock ?? */ { @@ -342,7 +342,7 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults() MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - // if your driver supports more than only one resultset + // if your driver supports more than only one resultset // and has one more at this moment return(true return (sal_False); } @@ -384,12 +384,12 @@ void SAL_CALL OCommonStatement::clearWarnings() Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -451,7 +451,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const { OSL_TRACE("OCommonStatement::getFastPropertyValue"); - switch (nHandle) { + switch (nHandle) { case PROPERTY_ID_QUERYTIMEOUT: case PROPERTY_ID_MAXFIELDSIZE: case PROPERTY_ID_MAXROWS: diff --git a/mysqlc/source/mysqlc_statement.hxx b/mysqlc/source/mysqlc_statement.hxx index 8a7fb500a0a8..2e0aea26321c 100644 --- a/mysqlc/source/mysqlc_statement.hxx +++ b/mysqlc/source/mysqlc_statement.hxx @@ -30,7 +30,7 @@ namespace connectivity using ::com::sun::star::uno::RuntimeException; using ::rtl::OUString; - typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper5< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable, @@ -56,11 +56,11 @@ namespace connectivity SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + ::std::list< OUString> m_aBatchList; - OConnection* m_pConnection; // The owning Connection object + OConnection* m_pConnection; // The owning Connection object - sql::Statement *cppStatement; + sql::Statement *cppStatement; protected: void disposeResultSet(); @@ -91,9 +91,9 @@ namespace connectivity void SAL_CALL disposing(void); // XInterface - void SAL_CALL release() throw(); + void SAL_CALL release() throw(); - void SAL_CALL acquire() throw(); + void SAL_CALL acquire() throw(); // XInterface Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & rType) @@ -121,15 +121,15 @@ namespace connectivity throw(SQLException, RuntimeException); // XWarningsSupplier - Any SAL_CALL getWarnings() throw(SQLException, RuntimeException); + Any SAL_CALL getWarnings() throw(SQLException, RuntimeException); - void SAL_CALL clearWarnings() throw(SQLException, RuntimeException); + void SAL_CALL clearWarnings() throw(SQLException, RuntimeException); // XCancellable - void SAL_CALL cancel() throw(RuntimeException); + void SAL_CALL cancel() throw(RuntimeException); // XCloseable - void SAL_CALL close() throw(SQLException, RuntimeException); + void SAL_CALL close() throw(SQLException, RuntimeException); // XMultipleResults ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getResultSet() @@ -137,7 +137,7 @@ namespace connectivity sal_Int32 SAL_CALL getUpdateCount() throw(SQLException, RuntimeException); - sal_Bool SAL_CALL getMoreResults() throw(SQLException, RuntimeException); + sal_Bool SAL_CALL getMoreResults() throw(SQLException, RuntimeException); // other methods OConnection* getOwnConnection() const { return m_pConnection;} @@ -147,7 +147,7 @@ namespace connectivity }; - class OStatement : public OCommonStatement, + class OStatement : public OCommonStatement, public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo @@ -163,14 +163,14 @@ namespace connectivity Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(RuntimeException); - void SAL_CALL acquire() throw(); - void SAL_CALL release() throw(); + void SAL_CALL acquire() throw(); + void SAL_CALL release() throw(); // XBatchExecution void SAL_CALL addBatch(const OUString& sql) throw(SQLException, RuntimeException); - void SAL_CALL clearBatch() throw(SQLException, RuntimeException); + void SAL_CALL clearBatch() throw(SQLException, RuntimeException); ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch() throw(SQLException, RuntimeException); diff --git a/mysqlc/source/mysqlc_subcomponent.hxx b/mysqlc/source/mysqlc_subcomponent.hxx index 8cf2f2b8b7e1..853091aa53d8 100644 --- a/mysqlc/source/mysqlc_subcomponent.hxx +++ b/mysqlc/source/mysqlc_subcomponent.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,7 +74,7 @@ namespace connectivity protected: // the parent must support the tunnel implementation ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParent; - SELF* m_pDerivedImplementation; + SELF* m_pDerivedImplementation; public: OSubComponent( @@ -107,14 +107,14 @@ namespace connectivity class OPropertyArrayUsageHelper { protected: - static sal_Int32 s_nRefCount; - static ::cppu::IPropertyArrayHelper* s_pProps; - static ::osl::Mutex s_aMutex; + static sal_Int32 s_nRefCount; + static ::cppu::IPropertyArrayHelper* s_pProps; + static ::osl::Mutex s_aMutex; public: OPropertyArrayUsageHelper(); virtual ~OPropertyArrayUsageHelper() - { // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods) + { // ARGHHHHHHH ..... would like to implement this in proparrhlp_impl.hxx (as we do with all other methods) // but SUNPRO 5 compiler (linker) doesn't like this ::osl::MutexGuard aGuard(s_aMutex); OSL_ENSURE(s_nRefCount > 0, "OPropertyArrayUsageHelper::~OPropertyArrayUsageHelper : suspicious call : have a refcount of 0 !"); @@ -128,7 +128,7 @@ namespace connectivity /** call this in the getInfoHelper method of your derived class. The method returns the array helper of the class, which is created if neccessary. */ - ::cppu::IPropertyArrayHelper* getArrayHelper(); + ::cppu::IPropertyArrayHelper* getArrayHelper(); protected: /** used to implement the creation of the array helper which is shared amongst all instances of the class. @@ -138,19 +138,19 @@ namespace connectivity <BR> as long as IPropertyArrayHelper has no virtual destructor, the implementation of ~OPropertyArrayUsageHelper assumes that you created an ::cppu::OPropertyArrayHelper when deleting s_pProps. - @return an pointer to the newly created array helper. Must not be NULL. + @return an pointer to the newly created array helper. Must not be NULL. */ virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const = 0; }; - template<class TYPE> - sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; + template<class TYPE> + sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0; - template<class TYPE> - ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL; + template<class TYPE> + ::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL; - template<class TYPE> - ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex; + template<class TYPE> + ::osl::Mutex OPropertyArrayUsageHelper< TYPE >::s_aMutex; //------------------------------------------------------------------ template <class TYPE> @@ -211,31 +211,31 @@ namespace connectivity } -#define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ - -#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException) \ - { \ - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \ - for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \ - ; \ - return pSupported != pEnd; \ - } \ +#define DECLARE_SERVICE_INFO() \ + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + +#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + sal_Bool SAL_CALL classname::supportsService(const ::rtl::OUString& _rServiceName) throw(::com::sun::star::uno::RuntimeException) \ + { \ + Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ + const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \ + for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \ + ; \ + return pSupported != pEnd; \ + } \ } diff --git a/mysqlc/source/mysqlc_types.cxx b/mysqlc/source/mysqlc_types.cxx index c363143d901d..24d40efdc194 100644 --- a/mysqlc/source/mysqlc_types.cxx +++ b/mysqlc/source/mysqlc_types.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/mysqlc/source/mysqlc_types.hxx b/mysqlc/source/mysqlc_types.hxx index 4d5d844ac480..2ddd2ee251d4 100644 --- a/mysqlc/source/mysqlc_types.hxx +++ b/mysqlc/source/mysqlc_types.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* +* * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ struct TypeInfoDef { const char *localTypeName; sal_Int32 minScale; sal_Int32 maxScale; - sal_Int32 sqlDataType; - sal_Int32 sqlDateTimeSub; + sal_Int32 sqlDataType; + sal_Int32 sqlDateTimeSub; sal_Int32 numPrecRadix; }; diff --git a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu index 3c076a4a3a7a..b9f239ebc03c 100644 --- a/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu @@ -2,7 +2,7 @@ <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite |