diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /connectivity/source/drivers/ado | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/source/drivers/ado')
29 files changed, 729 insertions, 729 deletions
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 882b1d57bdbd..1823251f88e9 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -42,108 +42,108 @@ OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInf { m_Command.put_CommandType(adCmdStoredProc); } -// ------------------------------------------------------------------------- + Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OPreparedStatement::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< XRow*>(this)); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException) { return m_aValue.isNull(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + ::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return (sal_Int64)m_aValue.getCurrency().int64; } -// ------------------------------------------------------------------------- + Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getObject", *this ); return Any(); } -// ------------------------------------------------------------------------- + sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { GET_PARAM() return m_aValue; } -// ------------------------------------------------------------------------- + void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { @@ -155,7 +155,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex pParam->put_Direction(adParamOutput); } } -// ------------------------------------------------------------------------- + void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) { ADOParameter* pParam = NULL; @@ -167,7 +167,7 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet pParam->put_NumericScale((sal_Int8)scale); } } -// ------------------------------------------------------------------------- + Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) @@ -175,51 +175,51 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get ::dbtools::throwFeatureNotImplementedException( "XRow::getBinaryStream", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getCharacterStream", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getClob", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getBlob", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *this ); return NULL; } -// ------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void SAL_CALL OCallableStatement::acquire() throw() { OPreparedStatement::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OCallableStatement::release() throw() { OPreparedStatement::release(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index 01e4aee0640d..0e25ab6d20fa 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -27,23 +27,23 @@ #include <com/sun/star/sdbc/XResultSet.hpp> -// ------------------------------------------------------------------------- + using namespace connectivity; using namespace connectivity::ado; -// ------------------------------------------------------------------------- + OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) ,m_aCatalog(_pCatalog) ,m_pConnection(_pCon) { } -// ----------------------------------------------------------------------------- + OCatalog::~OCatalog() { if(m_aCatalog.IsValid()) m_aCatalog.putref_ActiveConnection(NULL); m_aCatalog.clear(); } -// ----------------------------------------------------------------------------- + void OCatalog::refreshTables() { TStringVector aVector; @@ -72,7 +72,7 @@ void OCatalog::refreshTables() else m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()); } -// ------------------------------------------------------------------------- + void OCatalog::refreshViews() { TStringVector aVector; @@ -85,7 +85,7 @@ void OCatalog::refreshViews() else m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()); } -// ------------------------------------------------------------------------- + void OCatalog::refreshGroups() { TStringVector aVector; @@ -98,7 +98,7 @@ void OCatalog::refreshGroups() else m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()); } -// ------------------------------------------------------------------------- + void OCatalog::refreshUsers() { TStringVector aVector; @@ -111,7 +111,7 @@ void OCatalog::refreshUsers() else m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers()); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 1e6ab619f426..96d2e22b19cb 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -53,7 +53,7 @@ void WpADOColumn::Create() pColumn->Release( ); } } -// ------------------------------------------------------------------------- + OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn) : connectivity::sdbcx::OColumn(_bCase) ,m_pConnection(_pConnection) @@ -64,7 +64,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pC // m_aColumn.put_ParentCatalog(_pConnection->getAdoCatalog()->getCatalog()); fillPropertyValues(); } -// ------------------------------------------------------------------------- + OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection) : connectivity::sdbcx::OColumn(_bCase) ,m_pConnection(_pConnection) @@ -76,7 +76,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection) m_Type = DataType::OTHER; } -//-------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -93,14 +93,14 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OColumn_ADO::getSomething(rId); } -// ------------------------------------------------------------------------- + void OAdoColumn::construct() { sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY; @@ -108,7 +108,7 @@ void OAdoColumn::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING, nAttrib,&m_IsAscending, ::getBooleanCppuType()); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< OUString*>(0))); } -// ----------------------------------------------------------------------------- + void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { if(m_aColumn.IsValid()) @@ -189,7 +189,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r } OColumn_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue); } -// ----------------------------------------------------------------------------- + void OAdoColumn::fillPropertyValues() { if(m_aColumn.IsValid()) @@ -271,23 +271,23 @@ void OAdoColumn::fillPropertyValues() } } } -// ----------------------------------------------------------------------------- + WpADOColumn OAdoColumn::getColumnImpl() const { return m_aColumn; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void SAL_CALL OAdoColumn::acquire() throw() { OColumn_ADO::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoColumn::release() throw() { OColumn_ADO::release(); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 68063f1d9e6f..08dda621be35 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -47,17 +47,17 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) return new OAdoColumn(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -// ------------------------------------------------------------------------- + void OColumns::impl_refresh() throw(RuntimeException) { m_aCollection.Refresh(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OColumns::createDescriptor() { return new OAdoColumn(isCaseSensitive(),m_pConnection); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { @@ -125,14 +125,14 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro return new OAdoColumn(isCaseSensitive(),m_pConnection,pColumn->getColumnImpl()); } -// ------------------------------------------------------------------------- + // XDrop void OColumns::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { if(!m_aCollection.Delete(_sElementName)) ADOS::ThrowException(*m_pConnection->getConnection(),static_cast<XTypeProvider*>(this)); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 5dc84766b7a7..31768d537141 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -43,9 +43,9 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -//------------------------------------------------------------------------------ + IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection"); -// -------------------------------------------------------------------------------- + OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_xCatalog(NULL), @@ -92,11 +92,11 @@ OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeExcepti osl_atomic_decrement( &m_refCount ); } -//----------------------------------------------------------------------------- + OConnection::~OConnection() { } -//----------------------------------------------------------------------------- + void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) { osl_atomic_increment( &m_refCount ); @@ -157,12 +157,12 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& } osl_atomic_decrement( &m_refCount ); } -//----------------------------------------------------------------------------- + void SAL_CALL OConnection::release() throw() { relase_ChildImpl(); } -// -------------------------------------------------------------------------------- + Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -173,7 +173,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep m_aStatements.push_back(WeakReferenceHelper(*pStmt)); return pStmt; } -// -------------------------------------------------------------------------------- + Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -185,7 +185,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU m_aStatements.push_back(WeakReferenceHelper(*pStmt)); return xPStmt; } -// -------------------------------------------------------------------------------- + Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -197,7 +197,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin m_aStatements.push_back(WeakReferenceHelper(*pStmt)); return xPStmt; } -// -------------------------------------------------------------------------------- + OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -218,7 +218,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLExcept return sql; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -231,7 +231,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti else m_pAdoConnection->RollbackTrans(); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -240,7 +240,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return m_bAutocommit; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -249,7 +249,7 @@ void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) m_pAdoConnection->CommitTrans(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -258,14 +258,14 @@ void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) m_pAdoConnection->RollbackTrans(); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed && !m_pAdoConnection->get_State(); } -// -------------------------------------------------------------------------------- + Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -281,7 +281,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -292,7 +292,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, m_pAdoConnection->put_Mode(readOnly ? adModeRead : adModeReadWrite); ADOS::ThrowException(*m_pAdoConnection,*this); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -301,7 +301,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->get_Mode() == adModeRead; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -310,7 +310,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept m_pAdoConnection->PutDefaultDatabase(catalog); ADOS::ThrowException(*m_pAdoConnection,*this); } -// -------------------------------------------------------------------------------- + OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -318,7 +318,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->GetDefaultDatabase(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -350,7 +350,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE m_pAdoConnection->put_IsolationLevel(eIso); ADOS::ThrowException(*m_pAdoConnection,*this); } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, ADOS::ThrowException(*m_pAdoConnection,*this); return nRet; } -// -------------------------------------------------------------------------------- + Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -390,12 +390,12 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT return NULL; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } -// -------------------------------------------------------------------------------- + // XCloseable void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) { @@ -406,17 +406,17 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } dispose(); } -// -------------------------------------------------------------------------------- + // XWarningsSupplier Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) { return Any(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) { } -//-------------------------------------------------------------------- + void OConnection::buildTypeInfo() throw( SQLException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -475,7 +475,7 @@ void OConnection::buildTypeInfo() throw( SQLException) pRecordset->Release(); } } -//------------------------------------------------------------------------------ + void OConnection::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -500,7 +500,7 @@ void OConnection::disposing() dispose_ChildImpl(); } -// ----------------------------------------------------------------------------- + sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -509,7 +509,7 @@ sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Seque : OConnection_BASE::getSomething(rId); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -524,7 +524,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() } return pId->getImplementationId(); } -// ----------------------------------------------------------------------------- + const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, DataTypeEnum _nType, const OUString& _sTypeName, @@ -615,7 +615,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r // OSL_ENSURE(pTypeInfo, "getTypeInfoFromType: no type info found for this type!"); return pTypeInfo; } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index cfbe22524fcd..847b1dd1359b 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -45,7 +45,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) ,m_pConnection(_pCon) { } -// ------------------------------------------------------------------------- + sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); @@ -58,7 +58,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw return nValue; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); @@ -67,7 +67,7 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(: ADO_PROP(_aProperty); return (!aVar.isNull() && !aVar.isEmpty() ? aVar.getBool() : sal_False); } -// ------------------------------------------------------------------------- + OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); @@ -81,7 +81,7 @@ OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw return aValue; } -// ------------------------------------------------------------------------- + Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) { ADORecordset *pRecordset = m_pADOConnection->getTypeInfo(); @@ -91,7 +91,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > xRef = pResult; return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) { OLEVariant vtEmpty; @@ -109,12 +109,12 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLExc return xRef; } -// ------------------------------------------------------------------------- + OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { return getLiteral(DBLITERAL_CATALOG_SEPARATOR); } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) { OLEVariant vtEmpty; @@ -131,7 +131,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce xRef = pResult; return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) @@ -146,7 +146,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( xRef = pResult; return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) @@ -162,7 +162,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) @@ -178,7 +178,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) @@ -194,7 +194,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) @@ -211,67 +211,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( return xRef; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_BINARY_LITERAL); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Maximum Row Size")); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_CATALOG_NAME); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_CHAR_LITERAL); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_COLUMN_NAME); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) { return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_CURSOR_NAME); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Active Sessions")); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Max Columns in Table")); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_TEXT_COMMAND); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_TABLE_NAME); } -// ------------------------------------------------------------------------- + sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { return getInt32Property(OUString("Maximum Tables in SELECT")); } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { @@ -285,7 +285,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { @@ -300,7 +300,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) { @@ -315,7 +315,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException) @@ -331,7 +331,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { @@ -384,7 +384,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, @@ -401,138 +401,138 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return xRef; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { return getBoolProperty(OUString("Maximum Row Size Includes BLOB")); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Maximum Index Size")); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("Catalog Term")); } -// ------------------------------------------------------------------------- + OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { return getLiteral(DBLITERAL_QUOTE_PREFIX); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) { return isCapable(DBLITERAL_CORRELATION_NAME); } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { return getInt32Property(OUString("Catalog Location")) == DBPROPVAL_CL_START; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DML; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_ALL; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) { sal_Bool bValue(sal_False); @@ -551,323 +551,323 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 return bValue; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; return getBoolProperty(OUString("Outer Join Capabilities")); } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) { return new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); } -// ------------------------------------------------------------------------- + sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) { return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_PROCEDURE_NAME); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_SCHEMA_NAME); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_NONE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { return getBoolProperty(OUString("Read-Only Data Source")); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) { return isCapable(DBLITERAL_COLUMN_ALIAS); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) { return isCapable(DBLITERAL_CORRELATION_NAME); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) { return getBoolProperty(OUString("Rowset Conversions on Command")); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { return getBoolProperty(OUString("ORDER BY Columns in Select List")); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) { return isCapable(DBLITERAL_ESCAPE_PERCENT); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { return getBoolProperty(OUString("ORDER BY Columns in Select List")); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) { return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { return OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("User Name")); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("Provider Friendly Name")); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("Provider Version")); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("DBMS Version")); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("DBMS Name")); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("Procedure Term")); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { return getStringProperty(OUString("Schema Term")); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) { return 1; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) { sal_Int32 nRet = TransactionIsolation::NONE; @@ -890,12 +890,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S } return nRet; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) { return 0; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { ADORecordset *pRecordset = NULL; @@ -925,151 +925,151 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, Runt } return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { return getLiteral(DBLITERAL_ESCAPE_PERCENT); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) { sal_Int32 nProp = getInt32Property(OUString("SQL Support")); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return sal_True; return (getInt32Property(OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) { return supportsFullOuterJoins( ); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Max Columns in GROUP BY")); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { return getInt32Property(OUString("Max Columns in ORDER BY")); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) { return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) { return getMaxSize(DBLITERAL_USER_NAME); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) { return ResultSetType::FORWARD_ONLY != setType; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaData::getUDTs", *this ); return Reference< XResultSet >(); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 1fa5f97f92be..100c1ae27e2e 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::uno; -// ------------------------------------------------------------------------- + void ODatabaseMetaData::fillLiterals() { ADORecordset *pRecordset = NULL; @@ -78,7 +78,7 @@ void ODatabaseMetaData::fillLiterals() aRecordset.Close(); } } -// ------------------------------------------------------------------------- + sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId) { if(!m_aLiteralInfo.size()) @@ -90,7 +90,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId) nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == (-1)) ? 0 : (*aIter).second.cchMaxLen; return nSize; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) { if(!m_aLiteralInfo.size()) @@ -102,7 +102,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) return bSupported; } -// ------------------------------------------------------------------------- + OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) { if(!m_aLiteralInfo.size()) @@ -113,8 +113,8 @@ OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) sStr = (*aIter).second.pwszLiteralValue; return sStr; } -// ----------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + + void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { m_mColumns[8] = OColumn(OUString(),OUString("IS_GRANTABLE"), @@ -122,7 +122,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() 3,3,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { m_mColumns[6] = OColumn(OUString(),OUString("TYPE_NAME"), @@ -154,7 +154,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap() 1,1,0, DataType::INTEGER); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setTablesMap() { m_mColumns[5] = OColumn(OUString(),OUString("REMARKS"), @@ -162,7 +162,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap() 0,0,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() { m_mColumns[12] = OColumn(OUString(),OUString("NULLABLE"), @@ -170,7 +170,7 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() 1,1,0, DataType::INTEGER); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { m_mColumns[5] = OColumn(OUString(),OUString("KEY_SEQ"), @@ -182,7 +182,7 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() 0,0,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { m_mColumns[4] = OColumn(OUString(),OUString("NON_UNIQUE"), @@ -198,7 +198,7 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() 0,0,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { m_mColumns[6] = OColumn(OUString(),OUString("PRIVILEGE"), @@ -210,7 +210,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() 0,0,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() { m_mColumns[9] = OColumn(OUString(),OUString("KEY_SEQ"), @@ -218,7 +218,7 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() 1,1,0, DataType::INTEGER); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() { m_mColumns[3] = OColumn(OUString(),OUString("PRECISION"), @@ -246,7 +246,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() 1,1,0, DataType::INTEGER); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { m_mColumns[7] = OColumn(OUString(),OUString("REMARKS"), @@ -254,49 +254,49 @@ void ODatabaseMetaDataResultSetMetaData::setProceduresMap() 0,0,0, DataType::VARCHAR); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); return sal_False; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnServiceName(); return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getTableName(); return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getCatalogName(); return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnTypeName(); return OUString(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -304,7 +304,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 return (*m_mColumnsIter).second.isCaseSensitive(); return sal_True; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -312,8 +312,8 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 c return (*m_mColumnsIter).second.getSchemaName(); return OUString(); } -// ----------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + + ObjectTypeEnum OAdoGroup::MapObjectType(sal_Int32 _ObjType) { ObjectTypeEnum eNumType= adPermObjTable; @@ -330,7 +330,7 @@ ObjectTypeEnum OAdoGroup::MapObjectType(sal_Int32 _ObjType) } return eNumType; } -// ------------------------------------------------------------------------- + sal_Int32 OAdoGroup::MapRight(RightsEnum _eNum) { sal_Int32 nRight = 0; @@ -355,7 +355,7 @@ sal_Int32 OAdoGroup::MapRight(RightsEnum _eNum) return nRight; } -// ------------------------------------------------------------------------- + RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum) { sal_Int32 nRight = adRightNone; @@ -388,7 +388,7 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum) return (RightsEnum)nRight; } -// ------------------------------------------------------------------------- + void WpADOIndex::Create() { _ADOIndex* pIndex = NULL; @@ -405,7 +405,7 @@ void WpADOIndex::Create() pIndex->Release(); } } -// ------------------------------------------------------------------------- + void OAdoIndex::fillPropertyValues() { if(m_aIndex.IsValid()) @@ -416,7 +416,7 @@ void OAdoIndex::fillPropertyValues() m_IsClustered = m_aIndex.get_Clustered(); } } -// ----------------------------------------------------------------------------- + void WpADOKey::Create() { _ADOKey* pKey = NULL; @@ -433,7 +433,7 @@ void WpADOKey::Create() pKey->Release(); } } -// ------------------------------------------------------------------------- + void OAdoKey::fillPropertyValues() { if(m_aKey.IsValid()) @@ -445,7 +445,7 @@ void OAdoKey::fillPropertyValues() m_aProps->m_DeleteRule = MapRule(m_aKey.get_DeleteRule()); } } -// ------------------------------------------------------------------------- + sal_Int32 OAdoKey::MapRule(const RuleEnum& _eNum) { sal_Int32 eNum = KeyRule::NO_ACTION; @@ -466,7 +466,7 @@ sal_Int32 OAdoKey::MapRule(const RuleEnum& _eNum) } return eNum; } -// ------------------------------------------------------------------------- + RuleEnum OAdoKey::Map2Rule(const sal_Int32& _eNum) { RuleEnum eNum = adRINone; @@ -487,7 +487,7 @@ RuleEnum OAdoKey::Map2Rule(const sal_Int32& _eNum) } return eNum; } -// ------------------------------------------------------------------------- + sal_Int32 OAdoKey::MapKeyRule(const KeyTypeEnum& _eNum) { sal_Int32 nKeyType = KeyType::PRIMARY; @@ -505,7 +505,7 @@ sal_Int32 OAdoKey::MapKeyRule(const KeyTypeEnum& _eNum) } return nKeyType; } -// ------------------------------------------------------------------------- + KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) { KeyTypeEnum eNum( adKeyPrimary ); @@ -525,7 +525,7 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) } return eNum; } -// ----------------------------------------------------------------------------- + void WpADOTable::Create() { _ADOTable* pTable = NULL; @@ -542,7 +542,7 @@ void WpADOTable::Create() pTable->Release(); } } -// ------------------------------------------------------------------------- + OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum) { OLEVariant _rVar; @@ -552,7 +552,7 @@ OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eN pInterface->GetObjectOwner(sStr1,_eNum,_rVar,&aBSTR); return aBSTR; } -// ----------------------------------------------------------------------------- + void OAdoTable::fillPropertyValues() { if(m_aTable.IsValid()) @@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues() } } } -// ----------------------------------------------------------------------------- + void WpADOUser::Create() { _ADOUser* pUser = NULL; @@ -588,7 +588,7 @@ void WpADOUser::Create() pUser->Release(); } } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 74ccdee09ec3..36caa9a53f3e 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -41,14 +41,14 @@ using namespace dbtools; using namespace connectivity::ado; using namespace cppu; using namespace ::comphelper; -//------------------------------------------------------------------------------ + using namespace ::com::sun::star::lang; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// ------------------------------------------------------------------------- + ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet) :ODatabaseMetaDataResultSet_BASE(m_aMutex) ,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper) @@ -75,13 +75,13 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet // allocBuffer(); } -// ------------------------------------------------------------------------- + ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() { if(m_pRecordSet) m_pRecordSet->Release(); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::disposing(void) { OPropertySetHelper::disposing(); @@ -92,13 +92,13 @@ void ODatabaseMetaDataResultSet::disposing(void) m_aStatement = NULL; m_xMetaData.clear(); } -// ------------------------------------------------------------------------- + Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -// ------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), @@ -107,13 +107,13 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); } -// ----------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException) { if(!m_pRecordSet) throwFunctionSequenceException(*this); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { @@ -136,7 +136,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum return 0; // Never reached } #define BLOCK_SIZE 256 -// ------------------------------------------------------------------------- + Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -179,14 +179,14 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResult return NULL; return new SequenceInputStream(m_aValue); } -// ------------------------------------------------------------------------- + Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getCharacterStream", *this ); return NULL; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -199,7 +199,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex } return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { @@ -218,31 +218,31 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t return m_aValue; } -// ------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + ::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { @@ -262,21 +262,21 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t return m_aValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XResultSet::getRow", *this ); return 0; } -// ------------------------------------------------------------------------- + sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getLong", *this ); return sal_Int64(0); } -// ------------------------------------------------------------------------- + Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException) { @@ -291,34 +291,34 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData return m_xMetaData; } -// ------------------------------------------------------------------------- + Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this ); return NULL; } -// ------------------------------------------------------------------------- + Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { @@ -331,7 +331,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const columnIndex = mapColumn(columnIndex); return Any(); } -// ------------------------------------------------------------------------- + sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { @@ -350,7 +350,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) return m_aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { @@ -368,21 +368,21 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) return m_aValue; } -// ------------------------------------------------------------------------- + ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException) { @@ -396,7 +396,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException m_pRecordSet->get_EOF(&bIsAtEOF); return bIsAtEOF == VARIANT_TRUE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -407,7 +407,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, Ru return m_nRowPos == 1; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -418,7 +418,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run return sal_True; } -// ------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -430,7 +430,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, Ru if(first()) previous(); } -// ------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -443,7 +443,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt next(); m_bEOF = sal_True; } -// ------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException) { @@ -454,7 +454,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE } dispose(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException) { @@ -470,7 +470,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, Runt m_nRowPos = 1; return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException) { @@ -480,7 +480,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast()) ? sal_True : sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -498,7 +498,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -515,7 +515,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ m_nRowPos += row; return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -530,12 +530,12 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R --m_nRowPos; return bRet; } -// ------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException) { return m_aStatement.get(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException) { @@ -549,7 +549,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, m_pRecordSet->get_Status((sal_Int32*)&eRec); return (eRec & adRecDeleted) == adRecDeleted; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -561,7 +561,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException m_pRecordSet->get_Status((sal_Int32*)&eRec); return (eRec & adRecNew) == adRecNew; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -574,7 +574,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, m_pRecordSet->get_Status((sal_Int32*)&eRec); return (eRec & adRecModified) == adRecModified; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) { @@ -589,7 +589,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti m_pRecordSet->get_BOF(&bIsAtBOF); return bIsAtBOF == VARIANT_TRUE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException) { @@ -608,7 +608,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti else return SUCCEEDED(m_pRecordSet->MoveNext()); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException) { @@ -620,7 +620,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return m_aValue.isNull(); } -// ------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -631,7 +631,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run m_pRecordSet->Resync(adAffectCurrent,adResyncAllValues); } -// ------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) { @@ -643,34 +643,34 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) m_pRecordSet->Cancel(); } -// ------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException) { } -// ------------------------------------------------------------------------- + Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException) { return Any(); } -//------------------------------------------------------------------------------ + sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ResultSetConcurrency::READ_ONLY; } -//------------------------------------------------------------------------------ + sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return ResultSetType::FORWARD_ONLY; } -//------------------------------------------------------------------------------ + sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return FetchDirection::FORWARD; } -//------------------------------------------------------------------------------ + sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -679,27 +679,27 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const m_pRecordSet->get_CacheSize(&nValue); return nValue; } -//------------------------------------------------------------------------------ + OUString ODatabaseMetaDataResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return OUString(); } -//------------------------------------------------------------------------------ + void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 /*_par0*/) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "ResultSet::FetchDirection", *this ); } -//------------------------------------------------------------------------------ + void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { if(m_pRecordSet) m_pRecordSet->put_CacheSize(_par0); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const { @@ -714,12 +714,12 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) return new ::cppu::OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper() { return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper(); } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, @@ -742,7 +742,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( } return sal_False; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ @@ -761,7 +761,7 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( OSL_FAIL("setFastPropertyValue_NoBroadcast: Illegal handle value!"); } } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle @@ -786,7 +786,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( break; } } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setProceduresMap() { @@ -808,21 +808,21 @@ void ODatabaseMetaDataResultSet::setProceduresMap() pMetaData->setProceduresMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setCatalogsMap() { m_aColMapping.push_back(1); m_xMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setSchemasMap() { m_aColMapping.push_back(2); m_xMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setColumnPrivilegesMap() { @@ -838,7 +838,7 @@ void ODatabaseMetaDataResultSet::setColumnPrivilegesMap() pMetaData->setColumnPrivilegesMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setColumnsMap() { @@ -915,7 +915,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap() pMetaData->setColumnsMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setTablesMap() { @@ -927,7 +927,7 @@ void ODatabaseMetaDataResultSet::setTablesMap() pMetaData->setTablesMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setProcedureColumnsMap() { @@ -994,7 +994,7 @@ void ODatabaseMetaDataResultSet::setProcedureColumnsMap() pMetaData->setProcedureColumnsMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setPrimaryKeysMap() { @@ -1008,7 +1008,7 @@ void ODatabaseMetaDataResultSet::setPrimaryKeysMap() pMetaData->setProcedureColumnsMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setIndexInfoMap() { @@ -1050,7 +1050,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() pMetaData->setIndexInfoMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setTablePrivilegesMap() { @@ -1072,7 +1072,7 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap() pMetaData->setTablePrivilegesMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setCrossReferenceMap() { @@ -1103,7 +1103,7 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap() pMetaData->setCrossReferenceMap(); m_xMetaData = pMetaData; } -// ------------------------------------------------------------------------- + void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine) { sal_Int32 i=1; @@ -1181,22 +1181,22 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine) pMetaData->setTypeInfoMap(); m_xMetaData = pMetaData; } -// ----------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw() { ODatabaseMetaDataResultSet_BASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL ODatabaseMetaDataResultSet::release() throw() { ODatabaseMetaDataResultSet_BASE::release(); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// ----------------------------------------------------------------------------- + OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1208,7 +1208,7 @@ OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQ aField.get_Value(m_aValue); return m_aValue; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index e0905ed37f02..011e347625d4 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -29,13 +29,13 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// ------------------------------------------------------------------------- + ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData() { if(m_pRecordSet) m_pRecordSet->Release(); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) { sal_Int32 nSize = 0; @@ -49,7 +49,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal } return nSize; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -63,7 +63,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 } return nType; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) { @@ -81,7 +81,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw( m_nColCount = aFields.GetItemCount(); return m_nColCount; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -95,14 +95,14 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 c return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnLabel(); return getColumnName(column); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -117,7 +117,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -133,7 +133,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column } return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c return aField.GetPrecision(); return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum return aField.GetNumericScale(); return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -176,7 +176,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -193,7 +193,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -211,14 +211,14 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_ return sal_False; ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isWritable(); return isDefinitelyWritable(column); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 3daa811fcf14..0f4958bca242 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -39,8 +39,8 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// -------------------------------------------------------------------------------- -// -------------------------------------------------------------------------------- + + ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB) : ODriver_BASE(m_aMutex) ,m_xORB(_xORB) @@ -53,13 +53,13 @@ ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang: ++h; } } -// ------------------------------------------------------------------------- + ODriver::~ODriver() { CoUninitialize(); CoInitialize(NULL); } -//------------------------------------------------------------------------------ + void ODriver::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -76,12 +76,12 @@ void ODriver::disposing() ODriver_BASE::disposing(); } // static ServiceInfo -//------------------------------------------------------------------------------ + OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) { return OUString("com.sun.star.comp.sdbc.ado.ODriver"); } -//------------------------------------------------------------------------------ + Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { Sequence< OUString > aSNS( 2 ); @@ -89,13 +89,13 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (Runtime aSNS[1] = "com.sun.star.sdbcx.Driver"; return aSNS; } -//------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { return *(new ODriver(_rxFactory)); } -// -------------------------------------------------------------------------------- + OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); @@ -106,13 +106,13 @@ sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) thro return cppu::supportsService(this, _rServiceName); } -// -------------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } -// -------------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( ! acceptsURL(url) ) @@ -125,13 +125,13 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S return xCon; } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { return url.startsWith("sdbc:ado:"); } -// ----------------------------------------------------------------------------- + void ODriver::impl_checkURL_throw(const OUString& _sUrl) { if ( !acceptsURL(_sUrl) ) @@ -141,7 +141,7 @@ void ODriver::impl_checkURL_throw(const OUString& _sUrl) ::dbtools::throwGenericSQLException(sMessage ,*this); } // if ( !acceptsURL(_sUrl) ) } -// -------------------------------------------------------------------------------- + Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { impl_checkURL_throw(url); @@ -178,17 +178,17 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString } return Sequence< DriverPropertyInfo >(); } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODriver::getMajorVersion( ) throw(RuntimeException) { return 1; } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODriver::getMinorVersion( ) throw(RuntimeException) { return 0; } -// -------------------------------------------------------------------------------- + // XDataDefinitionSupplier Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { @@ -229,14 +229,14 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co } return xTab; } -// -------------------------------------------------------------------------------- + Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { impl_checkURL_throw(url); return getDataDefinitionByConnection(connect(url,info)); } -// ----------------------------------------------------------------------------- + void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) { ADOErrors *pErrors = NULL; diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 1ef7304ddaef..473573e0cadc 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// ------------------------------------------------------------------------- + void WpADOGroup::Create() { ADOGroup* pGroup = NULL; @@ -51,7 +51,7 @@ void WpADOGroup::Create() pGroup->Release(); } } -// ------------------------------------------------------------------------- + OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : OGroup_ADO(_bCase),m_pCatalog(_pParent) { construct(); @@ -61,14 +61,14 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : m_aGroup.Create(); } -// ------------------------------------------------------------------------- + OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent) { construct(); m_aGroup.Create(); m_aGroup.put_Name(_Name); } -// ------------------------------------------------------------------------- + void OAdoGroup::refreshUsers() { TStringVector aVector; @@ -81,7 +81,7 @@ void OAdoGroup::refreshUsers() else m_pUsers = new OUsers(m_pCatalog,m_aMutex,aVector,aUsers,isCaseSensitive()); } -//-------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -98,7 +98,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -106,7 +106,7 @@ sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run : OGroup_ADO::getSomething(rId); } -// ------------------------------------------------------------------------- + void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { if(m_aGroup.IsValid()) @@ -124,7 +124,7 @@ void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV } } } -// ------------------------------------------------------------------------- + void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { if(m_aGroup.IsValid()) @@ -137,13 +137,13 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } } } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType))); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType)); @@ -151,28 +151,28 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, s return MapRight(eNum); return 0; } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges)); } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges)); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoGroup::acquire() throw() { OGroup_ADO::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoGroup::release() throw() { OGroup_ADO::release(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 33531fc4c2b6..ba19dbeb9a77 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -38,22 +38,22 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -// ------------------------------------------------------------------------- + sdbcx::ObjectType OGroups::createObject(const OUString& _rName) { return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName); } -// ------------------------------------------------------------------------- + void OGroups::impl_refresh() throw(RuntimeException) { m_aCollection.Refresh(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OGroups::createDescriptor() { return new OAdoGroup(m_pCatalog,isCaseSensitive()); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { @@ -64,13 +64,13 @@ sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Refere m_aCollection.Append( pGroup->getImpl() ); return createObject( _rForName ); } -// ------------------------------------------------------------------------- + // XDrop void OGroups::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { m_aCollection.Delete(_sElementName); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 065a7e41a8b5..d0764651c348 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// ------------------------------------------------------------------------- + OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex) : OIndex_ADO(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase) ,m_pConnection(_pConnection) @@ -44,7 +44,7 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex m_aIndex = WpADOIndex(_pIndex); fillPropertyValues(); } -// ------------------------------------------------------------------------- + OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection) : OIndex_ADO(_bCase) ,m_pConnection(_pConnection) @@ -53,7 +53,7 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection) m_aIndex.Create(); } -// ------------------------------------------------------------------------- + void OAdoIndex::refreshColumns() { @@ -72,7 +72,7 @@ void OAdoIndex::refreshColumns() m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection); } -// ------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -89,14 +89,14 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OIndex_ADO::getSomething(rId); } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { if(m_aIndex.IsValid()) @@ -130,17 +130,17 @@ void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons } OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoIndex::acquire() throw() { OIndex_ADO::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoIndex::release() throw() { OIndex_ADO::release(); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index f5d5c49d5875..e95fd3db114b 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -42,17 +42,17 @@ sdbcx::ObjectType OIndexes::createObject(const OUString& _rName) { return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -// ------------------------------------------------------------------------- + void OIndexes::impl_refresh() throw(RuntimeException) { m_aCollection.Refresh(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OIndexes::createDescriptor() { return new OAdoIndex(isCaseSensitive(),m_pConnection); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { @@ -69,13 +69,13 @@ sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Refer return new OAdoIndex(isCaseSensitive(),m_pConnection,pIndex->getImpl()); } -// ------------------------------------------------------------------------- + // XDrop void OIndexes::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { m_aCollection.Delete(_sElementName); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index d92ca58646e1..d76bf93823b8 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// ------------------------------------------------------------------------- + OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey) : OKey_ADO(_bCase) ,m_pConnection(_pConnection) @@ -41,7 +41,7 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey) m_aKey = WpADOKey(_pKey); fillPropertyValues(); } -// ------------------------------------------------------------------------- + OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection) : OKey_ADO(_bCase) ,m_pConnection(_pConnection) @@ -49,7 +49,7 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection) construct(); m_aKey.Create(); } -// ------------------------------------------------------------------------- + void OAdoKey::refreshColumns() { TStringVector aVector; @@ -66,7 +66,7 @@ void OAdoKey::refreshColumns() else m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection); } -// ------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -83,14 +83,14 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OKey_ADO::getSomething(rId); } -// ------------------------------------------------------------------------- + void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { if(m_aKey.IsValid()) @@ -141,18 +141,18 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal } OKey_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue); } -// ------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void SAL_CALL OAdoKey::acquire() throw() { OKey_ADO::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoKey::release() throw() { OKey_ADO::release(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index bda4efcaadeb..735b8c6fc215 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -48,17 +48,17 @@ sdbcx::ObjectType OKeys::createObject(const OUString& _rName) { return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -// ------------------------------------------------------------------------- + void OKeys::impl_refresh() throw(RuntimeException) { m_aCollection.Refresh(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OKeys::createDescriptor() { return new OAdoKey(isCaseSensitive(),m_pConnection); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { @@ -95,14 +95,14 @@ sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XProper return new OAdoKey(isCaseSensitive(),m_pConnection,pKey->getImpl()); } -// ------------------------------------------------------------------------- + // XDrop void OKeys::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { if(!m_aCollection.Delete(OLEVariant(_sElementName))) ADOS::ThrowException(*m_pConnection->getConnection(),static_cast<XTypeProvider*>(this)); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 951f8888aee2..44967fbd136b 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -51,13 +51,13 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -//------------------------------------------------------------------------------ + // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ { return OUString("com.sun.star.sdbcx.ado.ResultSet"); } -// ------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { ::com::sun::star::uno::Sequence< OUString > aSupported(2); @@ -70,7 +70,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) t { return cppu::supportsService(this, _rServiceName); } -// ------------------------------------------------------------------------- + OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_pRecordSet(_pRecordSet) @@ -83,7 +83,7 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : ORes ,m_bOnFirstAfterOpen(sal_False) { } -// ------------------------------------------------------------------------- + OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_pRecordSet(_pRecordSet) @@ -96,7 +96,7 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) ,m_bOnFirstAfterOpen(sal_False) { } -// ----------------------------------------------------------------------------- + void OResultSet::construct() { osl_atomic_increment( &m_refCount ); @@ -113,13 +113,13 @@ void OResultSet::construct() m_bOnFirstAfterOpen = bIsAtBOF != VARIANT_TRUE; osl_atomic_decrement( &m_refCount ); } -// ------------------------------------------------------------------------- + OResultSet::~OResultSet() { if(m_pRecordSet) m_pRecordSet->Release(); } -// ------------------------------------------------------------------------- + void OResultSet::disposing(void) { OPropertySetHelper::disposing(); @@ -130,13 +130,13 @@ void OResultSet::disposing(void) m_xStatement.clear(); m_xMetaData.clear(); } -// ------------------------------------------------------------------------- + Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -// ------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), @@ -146,7 +146,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ return 0; // Never reached } #define BLOCK_SIZE 256 -// ------------------------------------------------------------------------- + Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -209,13 +209,13 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinarySt return m_aValue.isNull() ? NULL : new ::comphelper::SequenceInputStream(m_aValue); } -// ------------------------------------------------------------------------- + Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getCharacterStream", *this ); return NULL; } -// ----------------------------------------------------------------------------- + OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -225,48 +225,48 @@ OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, Runt aField.get_Value(m_aValue); return m_aValue; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + ::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) { @@ -279,14 +279,14 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) return (aPos > 0) ? static_cast<sal_Int32>(aPos) : m_nRowPos; // return the rowcount from driver if the driver doesn't support this return our count } -// ------------------------------------------------------------------------- + sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getLong", *this ); return sal_Int64(0); } -// ------------------------------------------------------------------------- + Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) { @@ -298,67 +298,67 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx m_xMetaData = new OResultSetMetaData(m_pRecordSet); return m_xMetaData; } -// ------------------------------------------------------------------------- + Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getClob", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getBlob", *this ); return NULL; } -// ------------------------------------------------------------------------- + Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *this ); return NULL; } -// ------------------------------------------------------------------------- + Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { return getValue(columnIndex).makeAny(); } -// ------------------------------------------------------------------------- + sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + ::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + ::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { return getValue(columnIndex); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) { @@ -370,7 +370,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti CHECK_RETURN(m_pRecordSet->get_EOF(&bIsAtEOF)) return bIsAtEOF == VARIANT_TRUE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -379,7 +379,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) return m_nRowPos == 1; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -388,7 +388,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) return sal_True; } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -398,7 +398,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) if(first()) m_bOnFirstAfterOpen = !previous(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -409,7 +409,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) next(); m_bEOF = sal_True; } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) { @@ -420,7 +420,7 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) } dispose(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) { @@ -436,7 +436,7 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) { @@ -452,7 +452,7 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) } return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -485,7 +485,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt m_bOnFirstAfterOpen = sal_False; return bCheck; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -505,7 +505,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt } return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -519,14 +519,14 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) } return bRet; } -// ------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_xStatement; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException) { @@ -541,7 +541,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio --m_nRowPos; return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -554,7 +554,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti ++m_nRowPos; return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -565,7 +565,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio m_pRecordSet->get_Status((sal_Int32*)&eRec); return (eRec & adRecModified) == adRecModified; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) { @@ -582,7 +582,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep } return bIsAtBOF == VARIANT_TRUE; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) { @@ -613,7 +613,7 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) { @@ -623,7 +623,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) return m_aValue.isNull(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) { @@ -633,16 +633,16 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) m_pRecordSet->Cancel(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) { } -// ------------------------------------------------------------------------- + Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) { return Any(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -653,7 +653,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) aEmpty.setNoArg(); m_pRecordSet->AddNew(aEmpty,aEmpty); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -664,7 +664,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) aEmpty.setNoArg(); m_pRecordSet->Update(aEmpty,aEmpty); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -674,7 +674,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) m_pRecordSet->Delete(adAffectCurrent); m_pRecordSet->UpdateBatch(adAffectCurrent); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) { @@ -684,7 +684,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept m_pRecordSet->CancelUpdate(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) { @@ -693,12 +693,12 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti // if ( getResultSetConcurrency() == ResultSetConcurrency::READ_ONLY ) // throw SQLException(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) { } -// ----------------------------------------------------------------------------- + void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -707,79 +707,79 @@ void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x) WpADOField aField = ADOS::getField(m_pRecordSet,columnIndex); aField.PutValue(x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { OLEVariant x; x.setNull(); updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,bool(x)); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ----------------------------------------------------------------------- + void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { @@ -790,7 +790,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer x->readBytes(aSeq,length); updateBytes(columnIndex,aSeq); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { if(!x.is()) @@ -800,7 +800,7 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re x->readBytes(aSeq,length); updateBytes(columnIndex,aSeq); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -809,20 +809,20 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) m_pRecordSet->Resync(adAffectCurrent,adResyncAllValues); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } -//------------------------------------------------------------------------------ + // XRowLocate Any SAL_CALL OResultSet::getBookmark( ) throw(SQLException, RuntimeException) { @@ -838,7 +838,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw(SQLException, RuntimeException) return makeAny((sal_Int32)(m_aBookmarks.size()-1)); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -853,7 +853,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLExc return SUCCEEDED(m_pRecordSet->Move(0,m_aBookmarks[nPos])); } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -868,7 +868,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I ::dbtools::throwFunctionSequenceException(*this); return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos])); } -//------------------------------------------------------------------------------ + sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -887,7 +887,7 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any m_pRecordSet->CompareBookmarks(m_aBookmarks[nPos1],m_aBookmarks[nPos2],&eNum); return ((sal_Int32)eNum) +1; } -//------------------------------------------------------------------------------ + sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -913,7 +913,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim bValue = aVar; return bValue; } -//------------------------------------------------------------------------------ + sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -924,7 +924,7 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLExce bookmark >>= nPos; return nPos; } -//------------------------------------------------------------------------------ + // XDeleteRows Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException) { @@ -973,7 +973,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro } return aSeq; } -//------------------------------------------------------------------------------ + sal_Int32 OResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -993,7 +993,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const } return nValue; } -//------------------------------------------------------------------------------ + sal_Int32 OResultSet::getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -1018,13 +1018,13 @@ sal_Int32 OResultSet::getResultSetType() const } return nValue; } -//------------------------------------------------------------------------------ + sal_Int32 OResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return FetchDirection::FORWARD; } -//------------------------------------------------------------------------------ + sal_Int32 OResultSet::getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -1032,26 +1032,26 @@ sal_Int32 OResultSet::getFetchSize() const m_pRecordSet->get_CacheSize(&nValue); return nValue; } -//------------------------------------------------------------------------------ + OUString OResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return OUString(); } -//------------------------------------------------------------------------------ + void OResultSet::setFetchDirection(sal_Int32 /*_par0*/) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "ResultSet::FetchDirection", *this ); } -//------------------------------------------------------------------------------ + void OResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { m_pRecordSet->put_CacheSize(_par0); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const { Sequence< com::sun::star::beans::Property > aProps(5); @@ -1067,12 +1067,12 @@ void OResultSet::setFetchSize(sal_Int32 _par0) return new ::cppu::OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper & OResultSet::getInfoHelper() { return *const_cast<OResultSet*>(this)->getArrayHelper(); } -// ------------------------------------------------------------------------- + sal_Bool OResultSet::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, @@ -1097,7 +1097,7 @@ sal_Bool OResultSet::convertFastPropertyValue( } return sal_False; } -// ------------------------------------------------------------------------- + void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { switch(nHandle) @@ -1118,7 +1118,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r ; } } -// ------------------------------------------------------------------------- + void OResultSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { switch(nHandle) @@ -1148,22 +1148,22 @@ void OResultSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const break; } } -// ----------------------------------------------------------------------------- + void SAL_CALL OResultSet::acquire() throw() { OResultSet_BASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OResultSet::release() throw() { OResultSet_BASE::release(); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 22461245b5bb..9c4912350f11 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -37,13 +37,13 @@ OResultSetMetaData::OResultSetMetaData( ADORecordset* _pRecordSet) if ( m_pRecordSet ) m_pRecordSet->AddRef(); } -// ------------------------------------------------------------------------- + OResultSetMetaData::~OResultSetMetaData() { if ( m_pRecordSet ) m_pRecordSet->Release(); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -51,14 +51,14 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) return aField.GetActualSize(); return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); return ADOS::MapADOType2Jdbc(aField.GetADOType()); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) { @@ -74,7 +74,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru m_nColCount = aFields.GetItemCount(); return m_nColCount; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -88,13 +88,13 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( } return bRet; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -104,7 +104,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) { OUString sTableName; @@ -118,27 +118,27 @@ OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQL } return sTableName; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { return getColumnName(column); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -149,7 +149,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -174,7 +174,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } return bRet; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -187,7 +187,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce } return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -195,7 +195,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return aField.GetPrecision(); return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -203,7 +203,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com: return aField.GetNumericScale(); return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -214,13 +214,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -231,7 +231,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -243,11 +243,11 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t return sal_False; ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { return isDefinitelyWritable(column); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 404101ebe57c..a232ad183177 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -45,13 +45,13 @@ using namespace ::comphelper; using namespace connectivity::ado; -//------------------------------------------------------------------------------ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace ::std; -//------------------------------------------------------------------------------ + OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE(m_aMutex) ,OPropertySetHelper(OStatement_BASE::rBHelper) ,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this) @@ -76,7 +76,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) : OStatement_BASE( osl_atomic_decrement( &m_refCount ); } -//------------------------------------------------------------------------------ + void OStatement_Base::disposeResultSet() { // free the cursor if alive @@ -86,7 +86,7 @@ void OStatement_Base::disposeResultSet() m_xResultSet.clear(); } -//------------------------------------------------------------------------------ + void OStatement_Base::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -108,18 +108,18 @@ void OStatement_Base::disposing() dispose_ChildImpl(); OStatement_BASE::disposing(); } -//----------------------------------------------------------------------------- + void SAL_CALL OStatement_Base::release() throw() { relase_ChildImpl(); } -//----------------------------------------------------------------------------- + Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -// ------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), @@ -129,7 +129,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes()); } -// ------------------------------------------------------------------------- + void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) { @@ -139,7 +139,7 @@ void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) CHECK_RETURN(m_Command.Cancel()) } -// ------------------------------------------------------------------------- + void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) { @@ -150,13 +150,13 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) } dispose(); } -// ------------------------------------------------------------------------- + void SAL_CALL OStatement::clearBatch( ) throw(SQLException, RuntimeException) { } -// ------------------------------------------------------------------------- + void OStatement_Base::reset() throw (SQLException) { @@ -169,10 +169,10 @@ void OStatement_Base::reset() throw (SQLException) if (m_xResultSet.get().is()) clearMyResultSet(); } -//-------------------------------------------------------------------- + // clearMyResultSet // If a ResultSet was created for this Statement, close it -//-------------------------------------------------------------------- + void OStatement_Base::clearMyResultSet () throw (SQLException) { @@ -189,7 +189,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) m_xResultSet.clear(); } -//-------------------------------------------------------------------- + sal_Int32 OStatement_Base::getRowCount () throw( SQLException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -198,11 +198,11 @@ sal_Int32 OStatement_Base::getRowCount () throw( SQLException) return m_RecordsAffected; } -//-------------------------------------------------------------------- + // getPrecision // Given a SQL type, return the maximum precision for the column. // Returns -1 if not known -//-------------------------------------------------------------------- + sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) { @@ -224,10 +224,10 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) return prec; } -//-------------------------------------------------------------------- + // setWarning // Sets the warning -//-------------------------------------------------------------------- + void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) { @@ -237,7 +237,7 @@ void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) m_aLastWarning = ex; } -// ------------------------------------------------------------------------- + void OStatement_Base::assignRecordSet( ADORecordset* _pRS ) { WpADORecordset aOldRS( m_RecordSet ); @@ -249,7 +249,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS ) if ( m_RecordSet.IsValid() ) m_RecordSet.PutRefDataSource( (IDispatch*)m_Command ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -279,7 +279,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep return m_RecordSet.IsValid(); } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -315,7 +315,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& return xRs; } -// ------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLException, RuntimeException) { @@ -325,14 +325,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLEx return (Reference< XConnection >)m_pConnection; } -// ------------------------------------------------------------------------- + Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this)); return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType); } -// ------------------------------------------------------------------------- + void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException) { @@ -342,7 +342,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru m_aBatchList.push_back(sql); } -// ------------------------------------------------------------------------- + Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -386,7 +386,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } return aRet; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) @@ -414,7 +414,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S return 0; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLException, RuntimeException) { @@ -424,7 +424,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLExce return m_xResultSet; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, RuntimeException) { @@ -437,7 +437,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, Runti return nRet; return -1; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, RuntimeException) { @@ -470,9 +470,9 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } return m_RecordSet.IsValid(); } -// ------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + + Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -481,9 +481,9 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti return makeAny(m_aLastWarning); } -// ------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + + void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -492,13 +492,13 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce m_aLastWarning = SQLWarning(); } -// ------------------------------------------------------------------------- -//------------------------------------------------------------------------------ + + sal_Int32 OStatement_Base::getQueryTimeOut() const throw(SQLException, RuntimeException) { return m_Command.get_CommandTimeout(); } -//------------------------------------------------------------------------------ + sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException) { ADO_LONGPTR nRet=-1; @@ -506,7 +506,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti ::dbtools::throwFunctionSequenceException(NULL); return nRet; } -//------------------------------------------------------------------------------ + sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException) { sal_Int32 nValue; @@ -523,7 +523,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R return nValue; } -//------------------------------------------------------------------------------ + sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException) { sal_Int32 nValue=0; @@ -543,27 +543,27 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE } return nValue; } -//------------------------------------------------------------------------------ + sal_Int32 OStatement_Base::getFetchDirection() const throw(SQLException, RuntimeException) { return FetchDirection::FORWARD; } -//------------------------------------------------------------------------------ + sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeException) { return m_nFetchSize; } -//------------------------------------------------------------------------------ + sal_Int32 OStatement_Base::getMaxFieldSize() const throw(SQLException, RuntimeException) { return 0; } -//------------------------------------------------------------------------------ + OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException) { return m_Command.GetName(); } -//------------------------------------------------------------------------------ + void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -572,7 +572,7 @@ void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, Run m_Command.put_CommandTimeout(seconds); } -//------------------------------------------------------------------------------ + void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -580,7 +580,7 @@ void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeExc m_nMaxRows = _par0; } -//------------------------------------------------------------------------------ + void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -596,7 +596,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLExceptio break; } } -//------------------------------------------------------------------------------ + void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -616,14 +616,14 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, Runt break; } } -//------------------------------------------------------------------------------ + void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedException( "Statement::FetchDirection", *this ); } -//------------------------------------------------------------------------------ + void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -632,14 +632,14 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE m_nFetchSize = _par0; } -//------------------------------------------------------------------------------ + void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedException( "Statement::MaxFieldSize", *this ); } -//------------------------------------------------------------------------------ + void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -648,7 +648,7 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R m_Command.put_Name(_par0); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const { Sequence< com::sun::star::beans::Property > aProps(10); @@ -669,12 +669,12 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R return new ::cppu::OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper() { return *const_cast<OStatement_Base*>(this)->getArrayHelper(); } -// ------------------------------------------------------------------------- + sal_Bool OStatement_Base::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, @@ -728,7 +728,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( } return bModified; } -// ------------------------------------------------------------------------- + void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) { switch(nHandle) @@ -765,7 +765,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A ; } } -// ------------------------------------------------------------------------- + void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { switch(nHandle) @@ -802,27 +802,27 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const ; } } -// ------------------------------------------------------------------------- + OStatement::~OStatement() { } IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement"); -// ----------------------------------------------------------------------------- + void SAL_CALL OStatement_Base::acquire() throw() { OStatement_BASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OStatement::acquire() throw() { OStatement_Base::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OStatement::release() throw() { OStatement_Base::release(); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 680140525188..d41d462ec7ab 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -// ------------------------------------------------------------------------- + OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable) : OTable_TYPEDEF(_pTables,_bCase) ,m_pCatalog(_pCatalog) @@ -56,7 +56,7 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa fillPropertyValues(); } -// ----------------------------------------------------------------------------- + OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog) : OTable_TYPEDEF(_pTables,_bCase) ,m_pCatalog(_pCatalog) @@ -66,13 +66,13 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa m_aTable.putref_ParentCatalog(_pCatalog->getCatalog()); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoTable::disposing(void) { OTable_TYPEDEF::disposing(); m_aTable.clear(); } -// ------------------------------------------------------------------------- + void OAdoTable::refreshColumns() { TStringVector aVector; @@ -89,7 +89,7 @@ void OAdoTable::refreshColumns() else m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pCatalog->getConnection()); } -// ------------------------------------------------------------------------- + void OAdoTable::refreshKeys() { TStringVector aVector; @@ -106,7 +106,7 @@ void OAdoTable::refreshKeys() else m_pKeys = new OKeys(*this,m_aMutex,aVector,aKeys,isCaseSensitive(),m_pCatalog->getConnection()); } -// ------------------------------------------------------------------------- + void OAdoTable::refreshIndexes() { TStringVector aVector; @@ -123,7 +123,7 @@ void OAdoTable::refreshIndexes() else m_pIndexes = new OIndexes(*this,m_aMutex,aVector,aIndexes,isCaseSensitive(),m_pCatalog->getConnection()); } -//-------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -140,14 +140,14 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OTable_TYPEDEF::getSomething(rId); } -// ------------------------------------------------------------------------- + // XRename void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) { @@ -159,12 +159,12 @@ void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, E OTable_TYPEDEF::rename(newName); } -// ----------------------------------------------------------------------------- + Reference< XDatabaseMetaData> OAdoTable::getMetaData() const { return m_pCatalog->getConnection()->getMetaData(); } -// ------------------------------------------------------------------------- + // XAlterTable void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { @@ -185,7 +185,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer m_pColumns->refresh(); refreshColumns(); } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -196,7 +196,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< X if(xOld.is()) alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor); } -// ------------------------------------------------------------------------- + void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { if(m_aTable.IsValid()) @@ -228,17 +228,17 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV } OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue); } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoTable::acquire() throw() { OTable_TYPEDEF::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoTable::release() throw() { OTable_TYPEDEF::release(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException) { return m_aTable.get_Name(); diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index ff8d6f292189..d506ef2a7c27 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -48,19 +48,19 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName)); } -// ------------------------------------------------------------------------- + void OTables::impl_refresh( ) throw(RuntimeException) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); m_aCollection.Refresh(); m_pCatalog->refreshTables(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OTables::createDescriptor() { return new OAdoTable(this,isCaseSensitive(),m_pCatalog); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { @@ -75,7 +75,7 @@ sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XProp return new OAdoTable(this,isCaseSensitive(),m_pCatalog,pTable->getImpl()); } -// ------------------------------------------------------------------------- + // XDrop void OTables::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { @@ -83,7 +83,7 @@ void OTables::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) if ( !m_aCollection.Delete(_sElementName) ) ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this)); } -// ----------------------------------------------------------------------------- + void OTables::appendNew(const OUString& _rsNewTable) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); @@ -97,7 +97,7 @@ void OTables::appendNew(const OUString& _rsNewTable) while (aListenerLoop.hasMoreElements()) static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 6fc7c92f22cd..dc3ce53f8ac5 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// ------------------------------------------------------------------------- + OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) : OUser_TYPEDEF(_bCase) ,m_pCatalog(_pParent) @@ -45,7 +45,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) else m_aUser.Create(); } -// ------------------------------------------------------------------------- + OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OUser_TYPEDEF(_Name,_bCase) , m_pCatalog(_pParent) @@ -54,7 +54,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) m_aUser.Create(); m_aUser.put_Name(_Name); } -// ------------------------------------------------------------------------- + void OAdoUser::refreshGroups() { TStringVector aVector; @@ -65,7 +65,7 @@ void OAdoUser::refreshGroups() else m_pGroups = new OGroups(m_pCatalog,m_aMutex,aVector,aGroups,isCaseSensitive()); } -//-------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -82,7 +82,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -90,7 +90,7 @@ sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt : OUser_TYPEDEF::getSomething(rId); } -// ------------------------------------------------------------------------- + void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) { if(m_aUser.IsValid()) @@ -108,7 +108,7 @@ void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVa } } } -// ------------------------------------------------------------------------- + void OAdoUser::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { if(m_aUser.IsValid()) @@ -121,47 +121,47 @@ void OAdoUser::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } } } -// ------------------------------------------------------------------------- + OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) : OAdoUser(_pParent,_bCase,_pUser) { } -// ------------------------------------------------------------------------- + OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OAdoUser(_pParent,_bCase,_Name) { } -// ------------------------------------------------------------------------- + void OUserExtend::construct() { OUser_TYPEDEF::construct(); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0))); } -// ----------------------------------------------------------------------------- + cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const { Sequence< com::sun::star::beans::Property > aProps; describeProperties(aProps); return new cppu::OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() { return *OUserExtend_PROP::getArrayHelper(); } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + void SAL_CALL OAdoUser::acquire() throw() { OUser_TYPEDEF::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoUser::release() throw() { OUser_TYPEDEF::release(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 o return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -182,7 +182,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sa ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); return nRights; } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -190,7 +190,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objT m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessGrant,RightsEnum(ADOS::mapRights2Ado(objPrivileges))); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } -// ------------------------------------------------------------------------- + void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -198,7 +198,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 obj m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessRevoke,RightsEnum(ADOS::mapRights2Ado(objPrivileges))); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } -// ----------------------------------------------------------------------------- + // XUser void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException) { @@ -207,7 +207,7 @@ void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUStr m_aUser.ChangePassword(objPassword,newPassword); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index 285a4551bf28..6c4643247464 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -41,17 +41,17 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) { return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName); } -// ------------------------------------------------------------------------- + void OUsers::impl_refresh() throw(RuntimeException) { m_aCollection.Refresh(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OUsers::createDescriptor() { return new OUserExtend(m_pCatalog,isCaseSensitive()); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { @@ -64,13 +64,13 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen return createObject( _rForName ); } -// ------------------------------------------------------------------------- + // XDrop void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { m_aCollection.Delete(_sElementName); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index fcc156e073a9..dba3c8e894e2 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -26,7 +26,7 @@ #include <comphelper/types.hxx> #include "TConnection.hxx" -// ------------------------------------------------------------------------- + using namespace comphelper; using namespace connectivity::ado; using namespace com::sun::star::uno; @@ -35,12 +35,12 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OAdoView,"com.sun.star.sdbcx.AView","com.sun.star.sdbcx.View"); -// ------------------------------------------------------------------------- + OAdoView::OAdoView(sal_Bool _bCase,ADOView* _pView) : OView_ADO(_bCase,NULL) ,m_aView(_pView) { } -//-------------------------------------------------------------------------- + Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -57,7 +57,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() } // com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ + sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -65,7 +65,7 @@ sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt : OView_ADO::getSomething(rId); } -// ------------------------------------------------------------------------- + void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const { if(m_aView.IsValid()) @@ -98,17 +98,17 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const else OView_ADO::getFastPropertyValue(rValue,nHandle); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoView::acquire() throw() { OView_ADO::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OAdoView::release() throw() { OView_ADO::release(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index cea3507a47fd..1401d17b5a4b 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -44,18 +44,18 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName) pView->setNew(sal_False); return pView; } -// ------------------------------------------------------------------------- + void OViews::impl_refresh( ) throw(RuntimeException) { m_aCollection.Refresh(); } -// ------------------------------------------------------------------------- + Reference< XPropertySet > OViews::createDescriptor() { return new OAdoView(isCaseSensitive()); } -// ------------------------------------------------------------------------- + // XAppend sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { @@ -81,14 +81,14 @@ sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Referen return createObject( _rForName ); } -// ------------------------------------------------------------------------- + // XDrop void OViews::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName) { if(!m_aCollection.Delete(_sElementName)) ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this)); } -// ------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 54452bd7ce6c..cebb4a38cc5a 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -412,7 +412,7 @@ OLEVariant::operator OUString() const return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(&varDest))); } -// ----------------------------------------------------------------------------- + void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) { // @@ -443,7 +443,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) } } -// ----------------------------------------------------------------------------- + OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const { ::com::sun::star::uno::Sequence< sal_Int8 > aRet; @@ -484,7 +484,7 @@ OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const return aRet; } -// ----------------------------------------------------------------------------- + OUString OLEVariant::getString() const { if(isNull()) @@ -492,7 +492,7 @@ OUString OLEVariant::getString() const else return *this; } -// ----------------------------------------------------------------------------- + sal_Bool OLEVariant::getBool() const { if (V_VT(this) == VT_BOOL) @@ -506,7 +506,7 @@ sal_Bool OLEVariant::getBool() const return V_BOOL(&varDest) == VARIANT_TRUE ? sal_True : sal_False; } -// ----------------------------------------------------------------------------- + IUnknown* OLEVariant::getIUnknown() const { if (V_VT(this) == VT_UNKNOWN) @@ -523,7 +523,7 @@ IUnknown* OLEVariant::getIUnknown() const V_UNKNOWN(&varDest)->AddRef(); return V_UNKNOWN(&varDest); } -// ----------------------------------------------------------------------------- + IDispatch* OLEVariant::getIDispatch() const { if (V_VT(this) == VT_DISPATCH) @@ -541,7 +541,7 @@ IDispatch* OLEVariant::getIDispatch() const V_DISPATCH(&varDest)->AddRef(); return V_DISPATCH(&varDest); } -// ----------------------------------------------------------------------------- + sal_uInt8 OLEVariant::getByte() const { if (V_VT(this) == VT_UI1) @@ -555,7 +555,7 @@ sal_uInt8 OLEVariant::getByte() const return V_UI1(&varDest); } -// ----------------------------------------------------------------------------- + sal_Int16 OLEVariant::getInt16() const { if (V_VT(this) == VT_I2) @@ -569,7 +569,7 @@ sal_Int16 OLEVariant::getInt16() const return V_I2(&varDest); } -// ----------------------------------------------------------------------------- + sal_Int8 OLEVariant::getInt8() const { if (V_VT(this) == VT_I1) @@ -584,7 +584,7 @@ sal_Int8 OLEVariant::getInt8() const return V_I1(&varDest); } -// ----------------------------------------------------------------------------- + sal_Int32 OLEVariant::getInt32() const { if (V_VT(this) == VT_I4) @@ -599,7 +599,7 @@ sal_Int32 OLEVariant::getInt32() const return V_I4(&varDest); } -// ----------------------------------------------------------------------------- + sal_uInt32 OLEVariant::getUInt32() const { if (V_VT(this) == VT_UI4) @@ -614,7 +614,7 @@ sal_uInt32 OLEVariant::getUInt32() const return V_UI4(&varDest); } -// ----------------------------------------------------------------------------- + float OLEVariant::getFloat() const { if (V_VT(this) == VT_R4) @@ -628,7 +628,7 @@ float OLEVariant::getFloat() const return V_R4(&varDest); } -// ----------------------------------------------------------------------------- + double OLEVariant::getDouble() const { if (V_VT(this) == VT_R8) @@ -642,7 +642,7 @@ double OLEVariant::getDouble() const return V_R8(&varDest); } -// ----------------------------------------------------------------------------- + double OLEVariant::getDate() const { if (V_VT(this) == VT_DATE) @@ -656,7 +656,7 @@ double OLEVariant::getDate() const return V_DATE(&varDest); } -// ----------------------------------------------------------------------------- + CY OLEVariant::getCurrency() const { if (V_VT(this) == VT_CY) @@ -674,7 +674,7 @@ CY OLEVariant::getCurrency() const return V_CY(&varDest); } -// ----------------------------------------------------------------------------- + SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const { if (V_VT(this) == (VT_ARRAY|VT_UI1)) @@ -688,7 +688,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const return V_ARRAY(&varDest); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Any OLEVariant::makeAny() const { ::com::sun::star::uno::Any aValue; @@ -771,8 +771,8 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const } return aValue; } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- + + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index bd1320128f11..ac5773348b81 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* ); -//--------------------------------------------------------------------------------------- + struct ProviderRequest { Reference< XSingleServiceFactory > xRet; @@ -73,7 +73,7 @@ struct ProviderRequest void* getProvider() const { return xRet.get(); } }; -//--------------------------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ado_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index 660c7dd6b5df..026390aa307b 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -1659,7 +1659,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any OpenSchema(adSchemaForeignKeys,vsa,vtEmpty,&pRecordset); return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array @@ -1701,7 +1701,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) { // Create elements used in the array @@ -1739,7 +1739,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool /*unique*/, sal_Bool /*approximate*/ ) @@ -1782,7 +1782,7 @@ ADORecordset* WpADOConnection::getIndexInfo( return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) @@ -1824,7 +1824,7 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno:: return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, @@ -1877,7 +1877,7 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) @@ -1916,7 +1916,7 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, @@ -1961,7 +1961,7 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno: return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, @@ -2025,7 +2025,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, @@ -2069,7 +2069,7 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, @@ -2112,7 +2112,7 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno: return pRecordset; } -// ----------------------------------------------------------------------------- + ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/) { // Create elements used in the array @@ -2140,7 +2140,7 @@ ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/) return pRec; } -// ----------------------------------------------------------------------------- + void WpADOColumn::put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject) { OSL_ENSURE(pInterface,"Interface is null!"); @@ -2148,7 +2148,7 @@ void WpADOColumn::put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject) OSL_ENSURE(bRet,"Could not set ParentCatalog!"); OSL_UNUSED(bRet); } -// ----------------------------------------------------------------------------- + void WpADOTable::putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject) { OSL_ENSURE(pInterface,"Interface is null!"); @@ -2156,12 +2156,12 @@ void WpADOTable::putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObjec OSL_ENSURE(bRet,"Could not set ParentCatalog!"); OSL_UNUSED(bRet); } -// ----------------------------------------------------------------------------- + void WpBase::setIDispatch(IDispatch* _pIUnknown) { pIUnknown = _pIUnknown; } -// ----------------------------------------------------------------------------- + void OTools::putValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition,const OLEVariant &_aValVar) { OSL_ENSURE(_rProps.IsValid(),"Properties are not valid!"); @@ -2173,7 +2173,7 @@ void OTools::putValue(const WpADOProperties& _rProps,const OLEVariant &_aPositio OSL_UNUSED(bRet); } } -// ----------------------------------------------------------------------------- + OLEVariant OTools::getValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition) { WpADOProperty aProp(_rProps.GetItem(_aPosition)); diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 9ca1a0223393..7e5647b44430 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -73,7 +73,7 @@ OLEString& ADOS::GetKeyStr() return sKeyStr; } -// ------------------------------------------------------------------------- + sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType) { sal_Int32 nType = DataType::VARCHAR; @@ -126,7 +126,7 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType) } return nType; } -// ------------------------------------------------------------------------- + DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine) { switch (_nType) @@ -159,7 +159,7 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine) } return adEmpty; } -// ----------------------------------------------------------------------------- + const int JET_ENGINETYPE_UNKNOWN = 0; const int JET_ENGINETYPE_JET10 = 1; const int JET_ENGINETYPE_JET11 = 2; @@ -219,7 +219,7 @@ sal_Bool ADOS::isJetEngine(sal_Int32 _nEngineType) } return bRet; } -// ----------------------------------------------------------------------------- + ObjectTypeEnum ADOS::mapObjectType2Ado(sal_Int32 objType) { ObjectTypeEnum eType = adPermObjTable; @@ -237,7 +237,7 @@ ObjectTypeEnum ADOS::mapObjectType2Ado(sal_Int32 objType) } return eType; } -// ----------------------------------------------------------------------------- + sal_Int32 ADOS::mapAdoType2Object(ObjectTypeEnum objType) { sal_Int32 nType = PrivilegeObject::TABLE; @@ -261,7 +261,7 @@ sal_Int32 ADOS::mapAdoType2Object(ObjectTypeEnum objType) #ifdef DELETE #undef DELETE #endif -// ----------------------------------------------------------------------------- + sal_Int32 ADOS::mapAdoRights2Sdbc(RightsEnum eRights) { sal_Int32 nRights = 0; @@ -282,7 +282,7 @@ sal_Int32 ADOS::mapAdoRights2Sdbc(RightsEnum eRights) return nRights; } -// ----------------------------------------------------------------------------- + sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights) { sal_Int32 eRights = adRightNone; @@ -304,7 +304,7 @@ sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights) return eRights; } -// ----------------------------------------------------------------------------- + WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { if ( !_pRecordSet ) @@ -320,7 +320,7 @@ WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) thr ::dbtools::throwInvalidIndexException(NULL); return aField; } -// ----------------------------------------------------------------------------- + |