diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-14 16:57:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-16 14:19:24 +0000 |
| commit | b9ed8dd02ac1435e6a02afbbbe789d29d965364a (patch) | |
| tree | 0806abdc3fcbeba2fd2bb6d4cd69e65b08144457 /connectivity | |
| parent | 2b326037931e5e98f543cdaa003606fc4fb9b43b (diff) | |
clang-cl loplugin: connectivity
Change-Id: I025cf2ad63f08bb58d54983982d7a116fac0ffea
Reviewed-on: https://gerrit.libreoffice.org/29874
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'connectivity')
66 files changed, 1201 insertions, 1201 deletions
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 4c62f8ca97d3..2d6906d0515f 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -31,15 +31,15 @@ using namespace com::sun::star::container; IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement","com.sun.star.sdbc.CallableStatement"); #define GET_PARAM() \ - ADOParameter* pParam = NULL; \ + ADOParameter* pParam = nullptr; \ m_pParameters->get_Item(OLEVariant(sal_Int32(columnIndex-1)),&pParam); \ if(pParam) \ pParam->get_Value(&m_aValue); //************ Class: java.sql.CallableStatement -OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql ) - : OPreparedStatement( _pConnection, _TypeInfo, sql ) +OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql ) + : OPreparedStatement( _pConnection, TypeInfo, sql ) { m_Command.put_CommandType(adCmdStoredProc); } @@ -147,7 +147,7 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { - ADOParameter* pParam = NULL; + ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); if(pParam) { @@ -158,7 +158,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) { - ADOParameter* pParam = NULL; + ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); if(pParam) { @@ -172,40 +172,40 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this ); - return NULL; + return nullptr; } Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); - return NULL; + return nullptr; } Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this ); - return NULL; + return nullptr; } Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); - return NULL; + return nullptr; } Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this ); - return NULL; + return nullptr; } Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this ); - return NULL; + return nullptr; } diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index a492286d2984..217b4824e696 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -39,7 +39,7 @@ OCatalog::OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon) : connectivity::sd OCatalog::~OCatalog() { if(m_aCatalog.IsValid()) - m_aCatalog.putref_ActiveConnection(NULL); + m_aCatalog.putref_ActiveConnection(nullptr); m_aCatalog.clear(); } diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 8f3ddcb364e8..6027041356d6 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -37,12 +37,12 @@ using namespace com::sun::star::sdbc; void WpADOColumn::Create() { - _ADOColumn* pColumn = NULL; + _ADOColumn* pColumn = nullptr; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOCOLUMN_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOCOLUMN_25, - (void**)&pColumn ); + reinterpret_cast<void**>(&pColumn) ); if( !FAILED( hr ) ) @@ -52,7 +52,7 @@ void WpADOColumn::Create() } } -OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn) +OAdoColumn::OAdoColumn(bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn) : connectivity::sdbcx::OColumn(_bCase) ,m_pConnection(_pConnection) { @@ -63,7 +63,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pC fillPropertyValues(); } -OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection) +OAdoColumn::OAdoColumn(bool _bCase,OConnection* _pConnection) : connectivity::sdbcx::OColumn(_bCase) ,m_pConnection(_pConnection) { @@ -77,7 +77,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection) Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -111,7 +111,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r { if(m_aColumn.IsValid()) { - const sal_Char* pAdoPropertyName = NULL; + const sal_Char* pAdoPropertyName = nullptr; switch(nHandle) { @@ -205,14 +205,14 @@ void OAdoColumn::fillPropertyValues() m_Scale = 4; m_Type = ADOS::MapADOType2Jdbc(eType); - sal_Bool bForceTo = sal_True; + bool bForceTo = true; const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); const OExtendedTypeInfo* pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),eType,OUString(),m_Precision,m_Scale,bForceTo); if ( pTypeInfo ) m_TypeName = pTypeInfo->aSimpleType.aTypeName; else if ( eType == adVarBinary && ADOS::isJetEngine(m_pConnection->getEngineType()) ) { - ::comphelper::UStringMixEqual aCase(sal_False); + ::comphelper::UStringMixEqual aCase(false); OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), [&aCase] (const OTypeInfoMap::value_type& typeInfo) { return aCase(typeInfo.second->getDBName(), OUString("VarBinary")); @@ -244,7 +244,7 @@ void OAdoColumn::fillPropertyValues() if ( aProps.IsValid() ) { - m_IsAutoIncrement = OTools::getValue( aProps, OUString("Autoincrement") ).getBool() == 1; + m_IsAutoIncrement = OTools::getValue( aProps, OUString("Autoincrement") ).getBool(); m_Description = OTools::getValue( aProps, OUString("Description") ).getString(); diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index e878effc8ecd..352ca9989257 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -59,9 +59,9 @@ Reference< XPropertySet > OColumns::createDescriptor() // XAppend sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { - OAdoColumn* pColumn = NULL; + OAdoColumn* pColumn = nullptr; Reference< XPropertySet > xColumn; - if ( !getImplementation( pColumn, descriptor ) || pColumn == NULL ) + if ( !getImplementation( pColumn, descriptor ) || pColumn == nullptr ) { // m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); pColumn = new OAdoColumn(isCaseSensitive(),m_pConnection); @@ -84,7 +84,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName; const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); - ::comphelper::UStringMixEqual aCase(sal_False); + ::comphelper::UStringMixEqual aCase(false); // search for typeinfo where the typename is equal sTypeName OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), [&aCase, &sTypeName] (const OTypeInfoMap::value_type& typeInfo) { @@ -94,7 +94,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro if ( aFind != pTypeInfoMap->end() ) // change column type if necessary aColumn.put_Type(aFind->first); - if ( SUCCEEDED(((ADOColumns*)m_aCollection)->Append(OLEVariant(aColumn.get_Name()),aColumn.get_Type(),aColumn.get_DefinedSize())) ) + if ( SUCCEEDED(static_cast<ADOColumns*>(m_aCollection)->Append(OLEVariant(aColumn.get_Name()),aColumn.get_Type(),aColumn.get_DefinedSize())) ) { WpADOColumn aAddedColumn = m_aCollection.GetItem(OLEVariant(aColumn.get_Name())); if ( aAddedColumn.IsValid() ) diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 6b431c55de97..47f011a24cf4 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -45,34 +45,34 @@ 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), + : OSubComponent<OConnection, OConnection_BASE>(static_cast<cppu::OWeakObject*>(_pDriver), this), + m_xCatalog(nullptr), m_pDriver(_pDriver), - m_pAdoConnection(NULL), - m_pCatalog(NULL), + m_pAdoConnection(nullptr), + m_pCatalog(nullptr), m_nEngineType(0), - m_bClosed(sal_False), - m_bAutocommit(sal_True) + m_bClosed(false), + m_bAutocommit(true) { osl_atomic_increment( &m_refCount ); - IClassFactory2* pIUnknown = NULL; + IClassFactory2* pIUnknown = nullptr; HRESULT hr; hr = CoGetClassObject( ADOS::CLSID_ADOCONNECTION_21, CLSCTX_INPROC_SERVER, - NULL, + nullptr, IID_IClassFactory2, - (void**)&pIUnknown ); + reinterpret_cast<void**>(&pIUnknown) ); if( !FAILED( hr ) ) { - ADOConnection *pCon = NULL; - IUnknown *pOuter = NULL; + ADOConnection *pCon = nullptr; + IUnknown *pOuter = nullptr; hr = pIUnknown->CreateInstanceLic( pOuter, - NULL, + nullptr, ADOS::IID_ADOCONNECTION_21, ADOS::GetKeyStr().asBSTR(), - (void**) &pCon); + reinterpret_cast<void**>(&pCon)); if( !FAILED( hr ) ) { @@ -108,18 +108,18 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& aDSN = aDSN.copy(7); sal_Int32 nTimeout = 20; - sal_Bool bSilent = sal_True; + sal_Bool bSilent = true; const PropertyValue *pIter = info.getConstArray(); const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) { - if(pIter->Name.equalsAscii("Timeout")) + if(pIter->Name == "Timeout") pIter->Value >>= nTimeout; - else if(pIter->Name.equalsAscii("Silent")) + else if(pIter->Name == "Silent") pIter->Value >>= bSilent; - else if(pIter->Name.equalsAscii("user")) + else if(pIter->Name == "user") pIter->Value >>= aUID; - else if(pIter->Name.equalsAscii("password")) + else if(pIter->Name == "password") pIter->Value >>= aPWD; } try @@ -209,7 +209,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLExcept OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),true); WpADOCommand aCommand; aCommand.Create(); - aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection); + aCommand.put_ActiveConnection(static_cast<IDispatch*>(*m_pAdoConnection)); aCommand.put_CommandText(sql); sql = aCommand.get_CommandText(); } @@ -385,7 +385,7 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) th checkDisposed(OConnection_BASE::rBHelper.bDisposed); - return NULL; + return nullptr; } void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) @@ -425,7 +425,7 @@ void OConnection::buildTypeInfo() throw( SQLException) VARIANT_BOOL bIsAtBOF; pRecordset->get_BOF(&bIsAtBOF); - sal_Bool bOk = sal_True; + bool bOk = true; if ( bIsAtBOF == VARIANT_TRUE ) bOk = SUCCEEDED(pRecordset->MoveNext()); @@ -479,10 +479,10 @@ void OConnection::disposing() OConnection_BASE::disposing(); - m_bClosed = sal_True; + m_bClosed = true; m_xMetaData = css::uno::WeakReference< css::sdbc::XDatabaseMetaData>(); m_xCatalog = css::uno::WeakReference< css::sdbcx::XTablesSupplier>(); - m_pDriver = NULL; + m_pDriver = nullptr; m_pAdoConnection->Close(); @@ -493,7 +493,7 @@ void OConnection::disposing() m_aTypeInfo.clear(); delete m_pAdoConnection; - m_pAdoConnection = NULL; + m_pAdoConnection = nullptr; dispose_ChildImpl(); } @@ -509,7 +509,7 @@ sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -527,10 +527,10 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r const OUString& _sTypeName, sal_Int32 _nPrecision, sal_Int32 _nScale, - sal_Bool& _brForceToType) + bool& _brForceToType) { - const OExtendedTypeInfo* pTypeInfo = NULL; - _brForceToType = sal_False; + const OExtendedTypeInfo* pTypeInfo = nullptr; + _brForceToType = false; // search for type ::std::pair<OTypeInfoMap::const_iterator, OTypeInfoMap::const_iterator> aPair = _rTypeInfo.equal_range(_nType); OTypeInfoMap::const_iterator aIter = aPair.first; @@ -580,14 +580,14 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r // we can not assert here because we could be in d&d pTypeInfo = aPair.first->second; - _brForceToType = sal_True; + _brForceToType = true; } else pTypeInfo = aIter->second; } else if ( _sTypeName.getLength() ) { - ::comphelper::UStringMixEqual aCase(sal_False); + ::comphelper::UStringMixEqual aCase(false); // search for typeinfo where the typename is equal _sTypeName OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(), [&aCase, &_sTypeName] (const OTypeInfoMap::value_type& typeInfo) { diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index 7fbd1b226092..ab1f6cd5cc61 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -59,13 +59,13 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw } -sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); ADO_PROP(_aProperty); - return (!aVar.isNull() && !aVar.isEmpty() ? aVar.getBool() : sal_False); + return !aVar.isNull() && !aVar.isEmpty() && aVar.getBool(); } OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) @@ -97,7 +97,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLExc OLEVariant vtEmpty; vtEmpty.setNoArg(); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; m_pADOConnection->OpenSchema(adSchemaCatalogs,vtEmpty,vtEmpty,&pRecordset); ADOS::ThrowException(*m_pADOConnection,*this); @@ -120,7 +120,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce OLEVariant vtEmpty; vtEmpty.setNoArg(); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; m_pADOConnection->OpenSchema(adSchemaSchemata,vtEmpty,vtEmpty,&pRecordset); ADOS::ThrowException(*m_pADOConnection,*this); @@ -219,7 +219,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLExc sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Maximum Row Size")); + return getInt32Property("Maximum Row Size"); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) @@ -249,12 +249,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLExcept sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Active Sessions")); + return getInt32Property("Active Sessions"); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Max Columns in Table")); + return getInt32Property("Max Columns in Table"); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) @@ -269,7 +269,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { - return getInt32Property(OUString("Maximum Tables in SELECT")); + return getInt32Property("Maximum Tables in SELECT"); } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( @@ -404,37 +404,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { - return getBoolProperty(OUString("Maximum Row Size Includes BLOB")); + return getBoolProperty("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 ; + return (getInt32Property("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 ; + return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; + return (getInt32Property("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 ; + return (getInt32Property("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 ; + return (getInt32Property("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 ; + return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) @@ -449,17 +449,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Maximum Index Size")); + return getInt32Property("Maximum Index Size"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL; + return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NON_NULL; } OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("Catalog Term")); + return getStringProperty("Catalog Term"); } OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) @@ -480,66 +480,66 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { - return getInt32Property(OUString("Catalog Location")) == DBPROPVAL_CL_START; + return getInt32Property("Catalog Location") == DBPROPVAL_CL_START; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE; + return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_IGNORE; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT; + return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_COMMIT; } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DML; + return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DML; } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_ALL; + return getInt32Property("Transaction DDL") == DBPROPVAL_TC_ALL; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE; + return getInt32Property("Prepare Abort Behavior") == DBPROPVAL_CB_PRESERVE; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE; + return getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("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); + bool bValue(false); - sal_Int32 nTxn = getInt32Property(OUString("Isolation Levels")); + sal_Int32 nTxn = getInt32Property("Isolation Levels"); if(level == TransactionIsolation::NONE) - bValue = sal_True; + bValue = true; else if(level == TransactionIsolation::READ_UNCOMMITTED) bValue = (nTxn & DBPROPVAL_TI_READUNCOMMITTED) == DBPROPVAL_TI_READUNCOMMITTED; else if(level == TransactionIsolation::READ_COMMITTED) @@ -554,35 +554,35 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { - return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; + return (getInt32Property("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")); + sal_Int32 nProp = getInt32Property("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")); + sal_Int32 nProp = getInt32Property("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")); + sal_Int32 nProp = getInt32Property("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; + return (getInt32Property("Schema Usage") & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { - return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; + return (getInt32Property("Schema Usage") & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION; } bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) @@ -592,7 +592,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) @@ -603,8 +603,8 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) - return sal_True; - return getBoolProperty(OUString("Outer Join Capabilities")); + return true; + return getBoolProperty("Outer Join Capabilities"); } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) @@ -629,52 +629,52 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLExcept sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_NONE; + return getInt32Property("Transaction DDL") == DBPROPVAL_TC_NONE; } sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { - return getBoolProperty(OUString("Read-Only Data Source")); + return getBoolProperty("Read-Only Data Source"); } sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL; + return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NULL; } sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) @@ -689,37 +689,37 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQL sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) { - return getBoolProperty(OUString("Rowset Conversions on Command")); + return getBoolProperty("Rowset Conversions on Command"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { - return getBoolProperty(OUString("ORDER BY Columns in Select List")); + return getBoolProperty("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; + return getInt32Property("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; + return getInt32Property("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; + return getInt32Property("GROUP BY Support") == DBPROPVAL_GB_NO_RELATION; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) @@ -729,138 +729,138 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLExcep sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { - return getBoolProperty(OUString("ORDER BY Columns in Select List")); + return getBoolProperty("ORDER BY Columns in Select List"); } sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { - return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { - return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; + return (getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; + return (getInt32Property("Schema Usage") & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { - return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; + return (getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("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; + return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(OUString("SQL Support")); + sal_Int32 nProp = getInt32Property("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(); + return "sdbc:ado:"+ m_pADOConnection->GetConnectionString(); } OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("User Name")); + return getStringProperty("User Name"); } OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("Provider Friendly Name")); + return getStringProperty("Provider Friendly Name"); } OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("Provider Version")); + return getStringProperty("Provider Version"); } OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("DBMS Version")); + return getStringProperty("DBMS Version"); } OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("DBMS Name")); + return getStringProperty("DBMS Name"); } OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("Procedure Term")); + return getStringProperty("Procedure Term"); } OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { - return getStringProperty(OUString("Schema Term")); + return getStringProperty("Schema Term"); } sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) @@ -898,7 +898,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeExc OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OLEVariant vtEmpty; vtEmpty.setNoArg(); m_pADOConnection->OpenSchema(adSchemaDBInfoKeywords,vtEmpty,vtEmpty,&pRecordset); @@ -957,27 +957,27 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { - sal_Int32 nProp = getInt32Property(OUString("SQL Support")); + sal_Int32 nProp = getInt32Property("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")); + sal_Int32 nProp = getInt32Property("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")); + sal_Int32 nProp = getInt32Property("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; + return true; + return (getInt32Property("Outer Join Capabilities") & 0x00000004L) == 0x00000004L; } sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) @@ -987,12 +987,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLExce sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Max Columns in GROUP BY")); + return getInt32Property("Max Columns in GROUP BY"); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { - return getInt32Property(OUString("Max Columns in ORDER BY")); + return getInt32Property("Max Columns in ORDER BY"); } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) @@ -1007,12 +1007,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLExceptio sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) @@ -1062,7 +1062,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) thr sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 8fdcff8fd7ac..1a479721fe4e 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno; void ODatabaseMetaData::fillLiterals() { - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OLEVariant vtEmpty; vtEmpty.setNoArg(); m_pADOConnection->OpenSchema(adSchemaDBInfoLiterals,vtEmpty,vtEmpty,&pRecordset); @@ -91,11 +91,11 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId) return nSize; } -sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) +bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) { if(m_aLiteralInfo.empty()) fillLiterals(); - sal_Bool bSupported = sal_False; + bool bSupported = false; ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); if(aIter != m_aLiteralInfo.end()) bSupported = (*aIter).second.fSupported; @@ -259,14 +259,14 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 co { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); - return sal_True; + return true; } sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); - return sal_False; + return false; } OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -302,7 +302,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCaseSensitive(); - return sal_True; + return true; } @@ -314,10 +314,10 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 c } -ObjectTypeEnum OAdoGroup::MapObjectType(sal_Int32 _ObjType) +ObjectTypeEnum OAdoGroup::MapObjectType(sal_Int32 ObjType) { ObjectTypeEnum eNumType= adPermObjTable; - switch(_ObjType) + switch(ObjType) { case PrivilegeObject::TABLE: break; @@ -360,43 +360,43 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum) { sal_Int32 nRight = adRightNone; if(_eNum & Privilege::SELECT) - nRight |= adRightRead; + nRight |= adRightRead; if(_eNum & Privilege::INSERT) - nRight |= adRightInsert; + nRight |= adRightInsert; if(_eNum & Privilege::UPDATE) - nRight |= adRightUpdate; + nRight |= adRightUpdate; if(_eNum & Privilege::DELETE) - nRight |= adRightDelete; + nRight |= adRightDelete; if(_eNum & Privilege::READ) - nRight |= adRightReadDesign; + nRight |= adRightReadDesign; if(_eNum & Privilege::CREATE) - nRight |= adRightCreate; + nRight |= adRightCreate; if(_eNum & Privilege::ALTER) - nRight |= adRightWriteDesign; + nRight |= adRightWriteDesign; if(_eNum & Privilege::REFERENCE) - nRight |= adRightReference; + nRight |= adRightReference; if(_eNum & Privilege::DROP) - nRight |= adRightDrop; + nRight |= adRightDrop; return (RightsEnum)nRight; } void WpADOIndex::Create() { - _ADOIndex* pIndex = NULL; + _ADOIndex* pIndex = nullptr; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOINDEX_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOINDEX_25, - (void**)&pIndex ); + reinterpret_cast<void**>(&pIndex) ); if( !FAILED( hr ) ) @@ -419,12 +419,12 @@ void OAdoIndex::fillPropertyValues() void WpADOKey::Create() { - _ADOKey* pKey = NULL; + _ADOKey* pKey = nullptr; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOKEY_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOKEY_25, - (void**)&pKey ); + reinterpret_cast<void**>(&pKey) ); if( !FAILED( hr ) ) @@ -467,7 +467,7 @@ sal_Int32 OAdoKey::MapRule(const RuleEnum& _eNum) return eNum; } -RuleEnum OAdoKey::Map2Rule(const sal_Int32& _eNum) +RuleEnum OAdoKey::Map2Rule(sal_Int32 _eNum) { RuleEnum eNum = adRINone; switch(_eNum) @@ -506,7 +506,7 @@ sal_Int32 OAdoKey::MapKeyRule(const KeyTypeEnum& _eNum) return nKeyType; } -KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) +KeyTypeEnum OAdoKey::Map2KeyRule(sal_Int32 _eNum) { KeyTypeEnum eNum( adKeyPrimary ); switch(_eNum) @@ -528,12 +528,12 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum) void WpADOTable::Create() { - _ADOTable* pTable = NULL; + _ADOTable* pTable = nullptr; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOTABLE_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOTABLE_25, - (void**)&pTable ); + reinterpret_cast<void**>(&pTable) ); if( !FAILED( hr ) ) @@ -574,12 +574,12 @@ void OAdoTable::fillPropertyValues() void WpADOUser::Create() { - _ADOUser* pUser = NULL; + _ADOUser* pUser = nullptr; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOUSER_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOUSER_25, - (void**)&pUser ); + reinterpret_cast<void**>(&pUser) ); if( !FAILED( hr ) ) diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 8c48a60ad31e..69269348dbbf 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -53,12 +53,12 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet :ODatabaseMetaDataResultSet_BASE(m_aMutex) ,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper) ,m_pRecordSet(_pRecordSet) - ,m_aStatement(NULL) - ,m_xMetaData(NULL) + ,m_aStatement(nullptr) + ,m_xMetaData(nullptr) ,m_nRowPos(0) - ,m_bWasNull(sal_False) - ,m_bEOF(sal_False) - ,m_bOnFirstAfterOpen(sal_False) + ,m_bWasNull(false) + ,m_bEOF(false) + ,m_bOnFirstAfterOpen(false) { osl_atomic_increment( &m_refCount ); m_aColMapping.push_back(-1); @@ -70,7 +70,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet m_bOnFirstAfterOpen = bIsAtBOF != VARIANT_TRUE; } else - m_bOnFirstAfterOpen = sal_False; + m_bOnFirstAfterOpen = false; osl_atomic_decrement( &m_refCount ); // allocBuffer(); } @@ -89,7 +89,7 @@ void ODatabaseMetaDataResultSet::disposing() ::osl::MutexGuard aGuard(m_aMutex); if(m_pRecordSet) m_pRecordSet->Close(); - m_aStatement = NULL; + m_aStatement = nullptr; m_xMetaData.clear(); } @@ -176,14 +176,14 @@ Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinar // else we ask for a bytesequence aField.get_Value(m_aValue); if(m_aValue.isNull()) - return NULL; + return nullptr; return new SequenceInputStream(m_aValue.getByteSequence()); } Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); - return NULL; + return nullptr; } @@ -195,7 +195,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex { getValue(2); if ( m_aValue.getInt16() != adCurrency ) - return sal_False; + return false; } return getValue(columnIndex).getBool(); } @@ -295,27 +295,27 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); - return NULL; + return nullptr; } Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); - return NULL; + return nullptr; } Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); - return NULL; + return nullptr; } Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); - return NULL; + return nullptr; } @@ -412,7 +412,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run checkRecordSet(); - return sal_True; + return true; } void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException) @@ -437,7 +437,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt if(last()) next(); - m_bEOF = sal_True; + m_bEOF = true; } @@ -459,9 +459,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, Runt if(!m_pRecordSet) - return sal_False; + return false; - sal_Bool bRet = SUCCEEDED(m_pRecordSet->MoveFirst()); + bool bRet = SUCCEEDED(m_pRecordSet->MoveFirst()); if ( bRet ) m_nRowPos = 1; return bRet; @@ -474,7 +474,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); - return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast()) ? sal_True : sal_False; + return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast()); } sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) @@ -487,12 +487,12 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ { OLEVariant aEmpty; aEmpty.setNoArg(); - sal_Bool bRet = SUCCEEDED(m_pRecordSet->Move(row,aEmpty)); + bool bRet = SUCCEEDED(m_pRecordSet->Move(row,aEmpty)); if(bRet) m_nRowPos = row; return bRet; } - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) @@ -502,11 +502,11 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ if(!m_pRecordSet) - return sal_False; + return false; OLEVariant aEmpty; aEmpty.setNoArg(); - sal_Bool bRet = SUCCEEDED(m_pRecordSet->Move(row,aEmpty)); + bool bRet = SUCCEEDED(m_pRecordSet->Move(row,aEmpty)); if(bRet) m_nRowPos += row; return bRet; @@ -519,9 +519,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R if(!m_pRecordSet) - return sal_False; + return false; - sal_Bool bRet = SUCCEEDED(m_pRecordSet->MovePrevious()); + bool bRet = SUCCEEDED(m_pRecordSet->MovePrevious()); if(bRet) --m_nRowPos; return bRet; @@ -541,9 +541,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, checkRecordSet(); - RecordStatusEnum eRec; - m_pRecordSet->get_Status((sal_Int32*)&eRec); - return (eRec & adRecDeleted) == adRecDeleted; + sal_Int32 eRec; + m_pRecordSet->get_Status(&eRec); + return (RecordStatusEnum(eRec) & adRecDeleted) == adRecDeleted; } sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) @@ -553,9 +553,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException checkRecordSet(); - RecordStatusEnum eRec; - m_pRecordSet->get_Status((sal_Int32*)&eRec); - return (eRec & adRecNew) == adRecNew; + sal_Int32 eRec; + m_pRecordSet->get_Status(&eRec); + return (RecordStatusEnum(eRec) & adRecNew) == adRecNew; } sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException) @@ -566,9 +566,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, checkRecordSet(); - RecordStatusEnum eRec; - m_pRecordSet->get_Status((sal_Int32*)&eRec); - return (eRec & adRecModified) == adRecModified; + sal_Int32 eRec; + m_pRecordSet->get_Status(&eRec); + return (RecordStatusEnum(eRec) & adRecModified) == adRecModified; } @@ -579,7 +579,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti if(!m_pRecordSet) - return sal_True; + return true; VARIANT_BOOL bIsAtBOF; m_pRecordSet->get_BOF(&bIsAtBOF); @@ -594,12 +594,12 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti if(!m_pRecordSet) - return sal_False; + return false; if(m_bOnFirstAfterOpen) { - m_bOnFirstAfterOpen = sal_False; - return sal_True; + m_bOnFirstAfterOpen = false; + return true; } else return SUCCEEDED(m_pRecordSet->MoveNext()); @@ -625,7 +625,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run checkRecordSet(); - m_pRecordSet->Resync(adAffectCurrent,adResyncAllValues); + m_pRecordSet->Resync(adAffectCurrent); } @@ -649,19 +649,19 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, Run return Any(); } -sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const +sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetConcurrency::READ_ONLY; } -sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const +sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetType::FORWARD_ONLY; } -sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const +sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; @@ -676,7 +676,7 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const return nValue; } -OUString ODatabaseMetaDataResultSet::getCursorName() const +OUString ODatabaseMetaDataResultSet::getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); @@ -718,7 +718,7 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper() { - return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( @@ -741,7 +741,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( default: ; } - return sal_False; + return false; } void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( @@ -1105,7 +1105,7 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap() m_xMetaData = pMetaData; } -void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine) +void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine) { sal_Int32 i=1; for(;i<19;i++) diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 17b190472106..4b35c93c6436 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -75,7 +75,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw( if(m_vMapping.size()) return m_mColumns.size(); - ADOFields* pFields = NULL; + ADOFields* pFields = nullptr; m_pRecordSet->get_Fields(&pFields); WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); m_nColCount = aFields.GetItemCount(); @@ -109,13 +109,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCurrency(); if(!m_pRecordSet) - return 0; + return false; WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) { return (aField.GetAttributes() & adFldFixed) == adFldFixed; } - return sal_False; + return false; } @@ -124,13 +124,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSigned(); if(!m_pRecordSet) - return 0; + return false; WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) { return (aField.GetAttributes() & adFldNegativeScale) == adFldNegativeScale; } - return sal_False; + return false; } sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -166,14 +166,14 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col return (*m_mColumnsIter).second.isNullable(); if(!m_pRecordSet) - return 0; + return sal_Int32(false); WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) { - return (aField.GetAttributes() & adFldIsNullable) == adFldIsNullable; + return sal_Int32((aField.GetAttributes() & adFldIsNullable) == adFldIsNullable); } - return sal_False; + return sal_Int32(false); } @@ -183,14 +183,14 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu return (*m_mColumnsIter).second.isReadOnly(); if(!m_pRecordSet) - return 0; + return false; WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) { // return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly; } - return sal_False; + return false; } @@ -200,14 +200,14 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_ return (*m_mColumnsIter).second.isDefinitelyWritable(); if(!m_pRecordSet) - return 0; + return false; WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]); if(aField.IsValid()) { return (aField.GetAttributes() & adFldUpdatable) == adFldUpdatable; } - return sal_False; + return false; ; } diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 040bf265dd0c..7d14a58206ae 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -46,10 +46,10 @@ ODriver::ODriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _ : ODriver_BASE(m_aMutex) ,m_xORB(_xORB) { - if ( FAILED(CoInitializeEx(NULL, COINIT_APARTMENTTHREADED)) ) + if ( FAILED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED)) ) { CoUninitialize(); - int h = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + int h = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); (void)h; ++h; } @@ -58,7 +58,7 @@ ODriver::ODriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _ ODriver::~ODriver() { CoUninitialize(); - CoInitialize(NULL); + CoInitialize(nullptr); } void ODriver::disposing() @@ -117,7 +117,7 @@ Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) throw(Runtim Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( ! acceptsURL(url) ) - return NULL; + return nullptr; // we need to wrap the connection as the construct call might throw std::unique_ptr<OConnection> pCon(new OConnection(this)); @@ -159,21 +159,21 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aDriverInfo.push_back(DriverPropertyInfo( OUString("IgnoreDriverPrivileges") ,OUString("Ignore the privileges from the database driver.") - ,sal_False + ,false ,OUString( "false" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( OUString("EscapeDateTime") ,OUString("Escape date time format.") - ,sal_False + ,false ,OUString( "true" ) ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( OUString("TypeInfoSettings") ,OUString("Defines how the type info of the database metadata should be manipulated.") - ,sal_False + ,false ,OUString( ) ,Sequence< OUString > ()) ); @@ -199,7 +199,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co if (ODriver_BASE::rBHelper.bDisposed) throw DisposedException(); - OConnection* pConnection = NULL; + OConnection* pConnection = nullptr; Reference< css::lang::XUnoTunnel> xTunnel(connection,UNO_QUERY); if(xTunnel.is()) { @@ -207,7 +207,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co for (OWeakRefArray::const_iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { - if ((OConnection*) Reference< XConnection >::query(i->get().get()).get() == pSearchConnection) + if (static_cast<OConnection*>(Reference< XConnection >::query(i->get().get()).get()) == pSearchConnection) { pConnection = pSearchConnection; break; @@ -216,7 +216,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co } - Reference< XTablesSupplier > xTab = NULL; + Reference< XTablesSupplier > xTab = nullptr; if(pConnection) { WpADOCatalog aCatalog; @@ -242,7 +242,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUS void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) { - ADOErrors *pErrors = NULL; + ADOErrors *pErrors = nullptr; _pAdoCon->get_Errors(&pErrors); if(!pErrors) return; // no error found @@ -258,7 +258,7 @@ void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& aException.ErrorCode = 1000; for (sal_Int32 i = nLen-1; i>=0; --i) { - ADOError *pError = NULL; + ADOError *pError = nullptr; pErrors->get_Item(OLEVariant(i),&pError); WpADOError aErr(pError); OSL_ENSURE(pError,"No error in collection found! BAD!"); diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index a02603a00f38..8318eeb99437 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -37,12 +37,12 @@ using namespace com::sun::star::sdbcx; void WpADOGroup::Create() { - ADOGroup* pGroup = NULL; + ADOGroup* pGroup = nullptr; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOGROUP_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOGROUP_25, - (void**)&pGroup ); + reinterpret_cast<void**>(&pGroup) ); if( !FAILED( hr ) ) @@ -52,7 +52,7 @@ void WpADOGroup::Create() } } -OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : OGroup_ADO(_bCase),m_pCatalog(_pParent) +OAdoGroup::OAdoGroup(OCatalog* _pParent,bool _bCase, ADOGroup* _pGroup) : OGroup_ADO(_bCase),m_pCatalog(_pParent) { construct(); if(_pGroup) @@ -62,11 +62,11 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup) : } -OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent) +OAdoGroup::OAdoGroup(OCatalog* _pParent,bool _bCase, const OUString& Name) : OGroup_ADO(Name,_bCase),m_pCatalog(_pParent) { construct(); m_aGroup.Create(); - m_aGroup.put_Name(_Name); + m_aGroup.put_Name(Name); } void OAdoGroup::refreshUsers() @@ -84,7 +84,7 @@ void OAdoGroup::refreshUsers() Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index ebcf88d0efbd..cc3208e232bf 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -57,8 +57,8 @@ Reference< XPropertySet > OGroups::createDescriptor() // XAppend sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - OAdoGroup* pGroup = NULL; - if ( !getImplementation(pGroup,descriptor) || pGroup == NULL ) + OAdoGroup* pGroup = nullptr; + if ( !getImplementation(pGroup,descriptor) || pGroup == nullptr ) m_pCatalog->getConnection()->throwGenericSQLException( STR_INVALID_GROUP_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); m_aCollection.Append( pGroup->getImpl() ); diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index 9cb1fff2437a..0e8dd81e2f92 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -36,8 +36,8 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex) - : sdbcx::OIndex(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase) +OAdoIndex::OAdoIndex(bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex) + : sdbcx::OIndex(OUString(),OUString(),false,false,false,_bCase) ,m_pConnection(_pConnection) { construct(); @@ -45,7 +45,7 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex fillPropertyValues(); } -OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection) +OAdoIndex::OAdoIndex(bool _bCase,OConnection* _pConnection) : sdbcx::OIndex(_bCase) ,m_pConnection(_pConnection) { @@ -74,7 +74,7 @@ void OAdoIndex::refreshColumns() Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index 15aa437d535f..b931984bd182 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -56,8 +56,8 @@ Reference< XPropertySet > OIndexes::createDescriptor() // XAppend sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - OAdoIndex* pIndex = NULL; - if ( !getImplementation(pIndex,descriptor) || pIndex == NULL ) + OAdoIndex* pIndex = nullptr; + if ( !getImplementation(pIndex,descriptor) || pIndex == nullptr ) m_pConnection->throwGenericSQLException( STR_INVALID_INDEX_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); ADOIndexes* pIndexes = m_aCollection; diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 6ce330bdc579..a569b8339090 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey) +OAdoKey::OAdoKey(bool _bCase,OConnection* _pConnection, ADOKey* _pKey) : OKey_ADO(_bCase) ,m_pConnection(_pConnection) { @@ -42,7 +42,7 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey) fillPropertyValues(); } -OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection) +OAdoKey::OAdoKey(bool _bCase,OConnection* _pConnection) : OKey_ADO(_bCase) ,m_pConnection(_pConnection) { @@ -69,7 +69,7 @@ void OAdoKey::refreshColumns() Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index b03836fb9976..257c0be04602 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -62,8 +62,8 @@ Reference< XPropertySet > OKeys::createDescriptor() // XAppend sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { - OAdoKey* pKey = NULL; - if ( !getImplementation( pKey, descriptor ) || pKey == NULL) + OAdoKey* pKey = nullptr; + if ( !getImplementation( pKey, descriptor ) || pKey == nullptr) m_pConnection->throwGenericSQLException( STR_INVALID_KEY_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); // To pass as column parameter to Key's Append method @@ -81,10 +81,10 @@ sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XProper WpADOKey aKey = pKey->getImpl(); OUString sName = aKey.get_Name(); if(!sName.getLength()) - aKey.put_Name(OUString("PrimaryKey") ); + aKey.put_Name("PrimaryKey"); ADOKeys* pKeys = m_aCollection; - if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey), + if ( FAILED(pKeys->Append(OLEVariant(static_cast<ADOKey*>(aKey)), adKeyPrimary, // must be every time adKeyPrimary vOptional)) ) { diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index bd7d4206b9fd..256fa3faa467 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -52,9 +52,9 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement"); -OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql) +OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql) : OStatement_Base( _pConnection ) - ,m_aTypeInfo(_TypeInfo) + ,m_aTypeInfo(TypeInfo) { osl_atomic_increment( &m_refCount ); @@ -89,7 +89,7 @@ OPreparedStatement::~OPreparedStatement() { OSL_FAIL( "OPreparedStatement::~OPreparedStatement: not disposed!" ); m_pParameters->Release(); - m_pParameters = NULL; + m_pParameters = nullptr; } } @@ -124,7 +124,7 @@ m_xMetaData.clear(); if (m_pParameters) { m_pParameters->Release(); - m_pParameters = NULL; + m_pParameters = nullptr; } OStatement_Base::disposing(); } @@ -151,7 +151,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc // Call SQLExecute try { - ADORecordset* pSet=NULL; + ADORecordset* pSet=nullptr; CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdUnknown,&pSet)) m_RecordSet = WpADORecordset(pSet); } @@ -171,7 +171,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run checkDisposed(OStatement_BASE::rBHelper.bDisposed); - ADORecordset* pSet=NULL; + ADORecordset* pSet=nullptr; CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdUnknown,&pSet)) if ( VT_ERROR == m_RecordsAffected.getType() ) { @@ -184,7 +184,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, - const sal_Int32& _nSize,const OLEVariant& _Val) throw(SQLException, RuntimeException) + sal_Int32 _nSize,const OLEVariant& Val) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -195,12 +195,12 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn if(nCount < (parameterIndex-1)) { OUString sDefaultName = "parame" + OUString::number(parameterIndex); - ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val); + ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,Val); if(pParam) { m_pParameters->Append(pParam); #if OSL_DEBUG_LEVEL > 0 - pParam = NULL; + pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); WpADOParameter aParam(pParam); if(pParam) @@ -213,7 +213,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn } else { - ADOParameter* pParam = NULL; + ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); WpADOParameter aParam(pParam); if(pParam) @@ -228,10 +228,10 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn if ( adVarBinary == eType && aParam.GetAttributes() == adParamLong ) { - aParam.AppendChunk(_Val); + aParam.AppendChunk(Val); } else - CHECK_RETURN(aParam.PutValue(_Val)); + CHECK_RETURN(aParam.PutValue(Val)); } } ADOS::ThrowException(*m_pConnection->getConnection(),*this); @@ -247,7 +247,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - return (Reference< XConnection >)m_pConnection; + return static_cast<Reference< XConnection >>(m_pConnection); } Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) @@ -427,7 +427,7 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim aVal.setEmpty(); for(sal_Int32 i=0;i<nCount;++i) { - ADOParameter* pParam = NULL; + ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(i),&pParam); WpADOParameter aParam(pParam); if(pParam) diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index f22c99f917c1..a5fecc621f38 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -74,22 +74,22 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : ORes ,m_pRecordSet(_pRecordSet) ,m_pStmt(pStmt) ,m_xStatement(*pStmt) - ,m_xMetaData(NULL) + ,m_xMetaData(nullptr) ,m_nRowPos(0) - ,m_bEOF(sal_False) - ,m_bOnFirstAfterOpen(sal_False) + ,m_bEOF(false) + ,m_bOnFirstAfterOpen(false) { } OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) ,m_pRecordSet(_pRecordSet) - ,m_pStmt(NULL) - ,m_xStatement(NULL) - ,m_xMetaData(NULL) + ,m_pStmt(nullptr) + ,m_xStatement(nullptr) + ,m_xMetaData(nullptr) ,m_nRowPos(0) - ,m_bEOF(sal_False) - ,m_bOnFirstAfterOpen(sal_False) + ,m_bEOF(false) + ,m_bOnFirstAfterOpen(false) { } @@ -202,13 +202,13 @@ Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int // else we ask for a bytesequence aField.get_Value(m_aValue); - return m_aValue.isNull() ? NULL : new ::comphelper::SequenceInputStream(m_aValue.getByteSequence()); + return m_aValue.isNull() ? nullptr : new ::comphelper::SequenceInputStream(m_aValue.getByteSequence()); } Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); - return NULL; + return nullptr; } OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) @@ -297,27 +297,27 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this ); - return NULL; + return nullptr; } Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); - return NULL; + return nullptr; } Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this ); - return NULL; + return nullptr; } Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this ); - return NULL; + return nullptr; } @@ -377,7 +377,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return sal_True; + return true; } void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) @@ -398,7 +398,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) if(last()) next(); - m_bEOF = sal_True; + m_bEOF = true; } @@ -422,10 +422,10 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) if(SUCCEEDED(m_pRecordSet->MoveFirst())) { m_nRowPos = 1; - m_bOnFirstAfterOpen = sal_False; - return sal_True; + m_bOnFirstAfterOpen = false; + return true; } - return sal_False; + return false; } @@ -435,11 +435,11 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - sal_Bool bRet = SUCCEEDED(m_pRecordSet->MoveLast()); + bool bRet = SUCCEEDED(m_pRecordSet->MoveLast()); if(bRet) { m_pRecordSet->get_RecordCount(&m_nRowPos); - m_bOnFirstAfterOpen = sal_False; + m_bOnFirstAfterOpen = false; } return bRet; } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt if(!row) // absolute with zero not allowed ::dbtools::throwFunctionSequenceException(*this); - sal_Bool bCheck = sal_True; + bool bCheck = true; if(row < 0) { bCheck = SUCCEEDED(m_pRecordSet->MoveLast()); @@ -473,7 +473,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt m_nRowPos = row; } if(bCheck) - m_bOnFirstAfterOpen = sal_False; + m_bOnFirstAfterOpen = false; return bCheck; } @@ -488,11 +488,11 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt sal_Int32 nNewPos = row; if ( m_bOnFirstAfterOpen && nNewPos > 0 ) --nNewPos; - sal_Bool bRet = SUCCEEDED(m_pRecordSet->Move(row,aEmpty)); + bool bRet = SUCCEEDED(m_pRecordSet->Move(row,aEmpty)); if(bRet) { m_nRowPos += row; - m_bOnFirstAfterOpen = sal_False; + m_bOnFirstAfterOpen = false; } return bRet; } @@ -502,11 +502,11 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - sal_Bool bRet = SUCCEEDED(m_pRecordSet->MovePrevious()); + bool bRet = SUCCEEDED(m_pRecordSet->MovePrevious()); if(bRet) { --m_nRowPos; - m_bOnFirstAfterOpen = sal_False; + m_bOnFirstAfterOpen = false; } return bRet; } @@ -525,9 +525,9 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - RecordStatusEnum eRec; - m_pRecordSet->get_Status((sal_Int32*)&eRec); - sal_Bool bRet = (eRec & adRecDeleted) == adRecDeleted; + sal_Int32 eRec; + m_pRecordSet->get_Status(&eRec); + bool bRet = (RecordStatusEnum(eRec) & adRecDeleted) == adRecDeleted; if(bRet) --m_nRowPos; return bRet; @@ -538,9 +538,9 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - RecordStatusEnum eRec; - m_pRecordSet->get_Status((sal_Int32*)&eRec); - sal_Bool bRet = (eRec & adRecNew) == adRecNew; + sal_Int32 eRec; + m_pRecordSet->get_Status(&eRec); + bool bRet = (RecordStatusEnum(eRec) & adRecNew) == adRecNew; if(bRet) ++m_nRowPos; return bRet; @@ -552,9 +552,9 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - RecordStatusEnum eRec; - m_pRecordSet->get_Status((sal_Int32*)&eRec); - return (eRec & adRecModified) == adRecModified; + sal_Int32 eRec; + m_pRecordSet->get_Status(&eRec); + return (RecordStatusEnum(eRec) & adRecModified) == adRecModified; } @@ -581,10 +581,10 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - sal_Bool bRet = sal_True; + bool bRet = true; if(m_bOnFirstAfterOpen) { - m_bOnFirstAfterOpen = sal_False; + m_bOnFirstAfterOpen = false; ++m_nRowPos; } else @@ -662,7 +662,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - m_pRecordSet->Delete(adAffectCurrent); + m_pRecordSet->Delete(); m_pRecordSet->UpdateBatch(adAffectCurrent); } @@ -798,7 +798,7 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - m_pRecordSet->Resync(adAffectCurrent,adResyncAllValues); + m_pRecordSet->Resync(adAffectCurrent); } void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException) @@ -885,11 +885,11 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - ADOProperties* pProps = NULL; + ADOProperties* pProps = nullptr; m_pRecordSet->get_Properties(&pProps); WpADOProperties aProps; aProps.setWithOutAddRef(pProps); - ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this); + ADOS::ThrowException(*static_cast<OConnection*>(m_pStmt->getConnection().get())->getConnection(),*this); OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection"); WpADOProperty aProp(aProps.GetItem(OUString("Bookmarks Ordered"))); @@ -897,9 +897,9 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim if(aProp.IsValid()) aVar = aProp.GetValue(); else - ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this); + ADOS::ThrowException(*static_cast<OConnection*>(m_pStmt->getConnection().get())->getConnection(),*this); - sal_Bool bValue(sal_False); + bool bValue(false); if(!aVar.isNull() && !aVar.isEmpty()) bValue = aVar.getBool(); return bValue; @@ -1010,7 +1010,7 @@ sal_Int32 OResultSet::getResultSetType() const return nValue; } -sal_Int32 OResultSet::getFetchDirection() const +sal_Int32 OResultSet::getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; @@ -1024,7 +1024,7 @@ sal_Int32 OResultSet::getFetchSize() const return nValue; } -OUString OResultSet::getCursorName() const +OUString OResultSet::getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); @@ -1069,7 +1069,7 @@ void OResultSet::setFetchSize(sal_Int32 _par0) ::cppu::IPropertyArrayHelper & OResultSet::getInfoHelper() { - return *const_cast<OResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OResultSet::convertFastPropertyValue( @@ -1094,7 +1094,7 @@ sal_Bool OResultSet::convertFastPropertyValue( default: ; } - return sal_False; + return false; } void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index a1140a658c05..dc0b046c3552 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -68,7 +68,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru if ( !m_pRecordSet ) return 0; - ADOFields* pFields = NULL; + ADOFields* pFields = nullptr; m_pRecordSet->get_Fields(&pFields); WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); m_nColCount = aFields.GetItemCount(); @@ -78,7 +78,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) { - sal_Bool bRet = sal_False; + bool bRet = false; WpADOField aField = ADOS::getField(m_pRecordSet,column); if ( aField.IsValid() ) { @@ -147,13 +147,13 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx { return ((aField.GetAttributes() & adFldFixed) == adFldFixed) && (aField.GetADOType() == adCurrency); } - return sal_False; + return false; } sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) { - sal_Bool bRet = sal_False; + bool bRet = false; WpADOField aField = ADOS::getField(m_pRecordSet,column); if ( aField.IsValid() ) { @@ -175,7 +175,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce DataTypeEnum eType = aField.GetADOType(); return !(eType == adUnsignedBigInt || eType == adUnsignedInt || eType == adUnsignedSmallInt || eType == adUnsignedTinyInt); } - return sal_False; + return false; } sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -200,15 +200,15 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) { - return (aField.GetAttributes() & adFldIsNullable) == adFldIsNullable; + return sal_Int32((aField.GetAttributes() & adFldIsNullable) == adFldIsNullable); } - return sal_False; + return sal_Int32(false); } sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - return sal_True; + return true; } @@ -219,7 +219,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx { // return (aField.GetStatus() & adFieldReadOnly) == adFieldReadOnly; } - return sal_False; + return false; } @@ -230,7 +230,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t { return (aField.GetAttributes() & adFldUpdatable) == adFldUpdatable; } - return sal_False; + return false; ; } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index e1c178d7b604..2afe88141be7 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -53,7 +53,7 @@ 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) + ,OSubComponent<OStatement_Base, OStatement_BASE>(static_cast<cppu::OWeakObject*>(_pConnection), this) ,m_pConnection(_pConnection) ,m_nMaxRows(0) ,m_nFetchSize(1) @@ -94,11 +94,11 @@ void OStatement_Base::disposing() disposeResultSet(); if ( m_Command.IsValid() ) - m_Command.putref_ActiveConnection( NULL ); + m_Command.putref_ActiveConnection( nullptr ); m_Command.clear(); if ( m_RecordSet.IsValid() ) - m_RecordSet.PutRefDataSource( NULL ); + m_RecordSet.PutRefDataSource( nullptr ); m_RecordSet.clear(); if (m_pConnection) @@ -243,10 +243,10 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS ) m_RecordSet = WpADORecordset( _pRS ); if ( aOldRS.IsValid() ) - aOldRS.PutRefDataSource( NULL ); + aOldRS.PutRefDataSource( nullptr ); if ( m_RecordSet.IsValid() ) - m_RecordSet.PutRefDataSource( (IDispatch*)m_Command ); + m_RecordSet.PutRefDataSource( static_cast<IDispatch*>(m_Command) ); } sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) @@ -261,7 +261,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep try { - ADORecordset* pSet = NULL; + ADORecordset* pSet = nullptr; CHECK_RETURN(m_Command.put_CommandText(sql)) CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdText,&pSet)) @@ -287,7 +287,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& reset(); - m_xResultSet = WeakReference<XResultSet>(NULL); + m_xResultSet = WeakReference<XResultSet>(nullptr); WpADORecordset aSet; aSet.Create(); @@ -322,7 +322,7 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLEx checkDisposed(OStatement_BASE::rBHelper.bDisposed); - return (Reference< XConnection >)m_pConnection; + return static_cast<Reference< XConnection >>(m_pConnection); } @@ -357,22 +357,22 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, if ( m_RecordSet.IsValid() ) - m_RecordSet.PutRefDataSource( NULL ); + m_RecordSet.PutRefDataSource( nullptr ); m_RecordSet.clear(); m_RecordSet.Create(); CHECK_RETURN(m_Command.put_CommandText(aBatchSql)) if ( m_RecordSet.IsValid() ) - m_RecordSet.PutRefDataSource((IDispatch*)m_Command); + m_RecordSet.PutRefDataSource(static_cast<IDispatch*>(m_Command)); CHECK_RETURN(m_RecordSet.UpdateBatch(adAffectAll)) - ADORecordset* pSet=NULL; + ADORecordset* pSet=nullptr; Sequence< sal_Int32 > aRet(nLen); sal_Int32* pArray = aRet.getArray(); for(sal_Int32 j=0;j<nLen;++j) { - pSet = NULL; + pSet = nullptr; OLEVariant aRecordsAffected; if(m_RecordSet.NextRecordset(aRecordsAffected,&pSet) && pSet) { @@ -396,7 +396,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S reset(); try { - ADORecordset* pSet = NULL; + ADORecordset* pSet = nullptr; CHECK_RETURN(m_Command.put_CommandText(sql)) CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdText|adExecuteNoRecords,&pSet)) } @@ -453,7 +453,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim try { - ADORecordset* pSet=NULL; + ADORecordset* pSet=nullptr; OLEVariant aRecordsAffected; if(m_RecordSet.IsValid() && m_RecordSet.NextRecordset(aRecordsAffected,&pSet) && pSet) assignRecordSet( pSet ); @@ -499,7 +499,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti { ADO_LONGPTR nRet=-1; if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet))) - ::dbtools::throwFunctionSequenceException(NULL); + ::dbtools::throwFunctionSequenceException(nullptr); return nRet; } @@ -540,7 +540,7 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE return nValue; } -sal_Int32 OStatement_Base::getFetchDirection() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getFetchDirection() throw(SQLException, RuntimeException) { return FetchDirection::FORWARD; } @@ -550,7 +550,7 @@ sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeExcep return m_nFetchSize; } -sal_Int32 OStatement_Base::getMaxFieldSize() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getMaxFieldSize() throw(SQLException, RuntimeException) { return 0; } @@ -677,7 +677,7 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper() { - return *const_cast<OStatement_Base*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OStatement_Base::convertFastPropertyValue( @@ -687,9 +687,9 @@ sal_Bool OStatement_Base::convertFastPropertyValue( const Any& rValue ) throw (css::lang::IllegalArgumentException) { - sal_Bool bModified = sal_False; + bool bModified = false; - sal_Bool bValidAdoRS = m_RecordSet.IsValid(); + bool bValidAdoRS = m_RecordSet.IsValid(); // some of the properties below, when set, are remembered in a member, and applied in the next execute // For these properties, the record set does not need to be valid to allow setting them. // For all others (where the values are forwarded to the ADO RS directly), the recordset must be valid. @@ -727,7 +727,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( } catch( const Exception& e ) { - bModified = sal_True; // will ensure that the property is set + bModified = true; // will ensure that the property is set OSL_FAIL( "OStatement_Base::convertFastPropertyValue: caught something strange!" ); (void)e; } @@ -800,7 +800,7 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const rValue <<= getFetchSize(); break; case PROPERTY_ID_ESCAPEPROCESSING: - rValue <<= sal_True; + rValue <<= true; break; case PROPERTY_ID_USEBOOKMARKS: default: diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 8281fb84d60a..2aacc86ac199 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -46,7 +46,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::container; -OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable) +OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable) : OTable_TYPEDEF(_pTables,_bCase) ,m_pCatalog(_pCatalog) { @@ -57,7 +57,7 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa } -OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog) +OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,bool _bCase,OCatalog* _pCatalog) : OTable_TYPEDEF(_pTables,_bCase) ,m_pCatalog(_pCatalog) { @@ -126,7 +126,7 @@ void OAdoTable::refreshIndexes() Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -171,9 +171,9 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); - sal_Bool bError = sal_True; - OAdoColumn* pColumn = NULL; - if(::comphelper::getImplementation(pColumn,descriptor) && pColumn != NULL) + bool bError = true; + OAdoColumn* pColumn = nullptr; + if(::comphelper::getImplementation(pColumn,descriptor) && pColumn != nullptr) { WpADOColumns aColumns = m_aTable.get_Columns(); bError = !aColumns.Delete(colName); diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index 1e79e0a4ffef..bc3e9883578b 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -64,8 +64,8 @@ Reference< XPropertySet > OTables::createDescriptor() // XAppend sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XPropertySet >& descriptor ) { - OAdoTable* pTable = NULL; - if ( !getImplementation( pTable, descriptor ) || pTable == NULL ) + OAdoTable* pTable = nullptr; + if ( !getImplementation( pTable, descriptor ) || pTable == nullptr ) m_pCatalog->getConnection()->throwGenericSQLException( STR_INVALID_TABLE_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); @@ -89,7 +89,7 @@ void OTables::appendNew(const OUString& _rsNewTable) OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); m_aCollection.Refresh(); - insertElement(_rsNewTable,NULL); + insertElement(_rsNewTable,nullptr); // notify our container listeners ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_rsNewTable), Any(), Any()); diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 725a26f8bb79..b219bcfb61d0 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) +OAdoUser::OAdoUser(OCatalog* _pParent,bool _bCase, ADOUser* _pUser) : OUser_TYPEDEF(_bCase) ,m_pCatalog(_pParent) { @@ -46,13 +46,13 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) m_aUser.Create(); } -OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) - : OUser_TYPEDEF(_Name,_bCase) +OAdoUser::OAdoUser(OCatalog* _pParent,bool _bCase, const OUString& Name) + : OUser_TYPEDEF(Name,_bCase) , m_pCatalog(_pParent) { construct(); m_aUser.Create(); - m_aUser.put_Name(_Name); + m_aUser.put_Name(Name); } void OAdoUser::refreshGroups() @@ -68,7 +68,7 @@ void OAdoUser::refreshGroups() Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -122,13 +122,13 @@ void OAdoUser::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } } -OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser) +OUserExtend::OUserExtend(OCatalog* _pParent,bool _bCase, ADOUser* _pUser) : OAdoUser(_pParent,_bCase,_pUser) { } -OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) - : OAdoUser(_pParent,_bCase,_Name) +OUserExtend::OUserExtend(OCatalog* _pParent,bool _bCase, const OUString& Name) + : OAdoUser(_pParent,_bCase,Name) { } diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index b6876dced8dc..b136fe944d9a 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -55,11 +55,11 @@ Reference< XPropertySet > OUsers::createDescriptor() // XAppend sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - OUserExtend* pUser = NULL; - if ( !getImplementation( pUser, descriptor ) || pUser == NULL ) + OUserExtend* pUser = nullptr; + if ( !getImplementation( pUser, descriptor ) || pUser == nullptr ) m_pCatalog->getConnection()->throwGenericSQLException( STR_INVALID_USER_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); - ADOUsers* pUsers = (ADOUsers*)m_aCollection; + ADOUsers* pUsers = static_cast<ADOUsers*>(m_aCollection); pUsers->Append(OLEVariant(pUser->getImpl()),OLEString(pUser->getPassword()).asBSTR()); return createObject( _rForName ); diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 9d276c952062..a419526cae94 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -36,14 +36,14 @@ 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) +OAdoView::OAdoView(bool _bCase,ADOView* _pView) : OView_ADO(_bCase,nullptr) ,m_aView(_pView) { } Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() { - static ::cppu::OImplementationId * pId = 0; + static ::cppu::OImplementationId * pId = nullptr; if (! pId) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); @@ -86,7 +86,7 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const m_aView.get_Command(aVar); if(!aVar.isNull() && !aVar.isEmpty()) { - ADOCommand* pCom = (ADOCommand*)aVar.getIDispatch(); + ADOCommand* pCom = static_cast<ADOCommand*>(aVar.getIDispatch()); OLEString aBSTR; pCom->get_CommandText(aBSTR.getAddress()); rValue <<= aBSTR.asOUString(); diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index 7264bad9bf9e..fb3336e2f2a3 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star::container; sdbcx::ObjectType OViews::createObject(const OUString& _rName) { OAdoView* pView = new OAdoView(isCaseSensitive(),m_aCollection.GetItem(_rName)); - pView->setNew(sal_False); + pView->setNew(false); return pView; } @@ -59,8 +59,8 @@ Reference< XPropertySet > OViews::createDescriptor() // XAppend sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - OAdoView* pView = NULL; - if ( !getImplementation( pView, descriptor ) || pView == NULL ) + OAdoView* pView = nullptr; + if ( !getImplementation( pView, descriptor ) || pView == nullptr ) m_pCatalog->getConnection()->throwGenericSQLException( STR_INVALID_VIEW_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) ); WpADOCommand aCommand; @@ -71,7 +71,7 @@ sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Referen OUString sName( _rForName ); aCommand.put_Name(sName); aCommand.put_CommandText(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)))); - ADOViews* pViews = (ADOViews*)m_aCollection; + ADOViews* pViews = static_cast<ADOViews*>(m_aCollection); if(FAILED(pViews->Append(OLEString(sName).asBSTR(),aCommand))) 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 93fabdbe1115..b40f7d82fc39 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::bridge::oleautomation; using namespace connectivity::ado; OLEString::OLEString() - :m_sStr(NULL) + :m_sStr(nullptr) { } OLEString::OLEString(const BSTR& _sBStr) @@ -79,7 +79,7 @@ OLEString& OLEString::operator=(const BSTR& _rSrc) } OUString OLEString::asOUString() const { - return (m_sStr != NULL) ? OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : OUString(); + return (m_sStr != nullptr) ? OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : OUString(); } BSTR OLEString::asBSTR() const { @@ -91,7 +91,7 @@ BSTR* OLEString::getAddress() } sal_Int32 OLEString::length() const { - return (m_sStr != NULL) ? ::SysStringLen(m_sStr) : 0; + return (m_sStr != nullptr) ? ::SysStringLen(m_sStr) : 0; } OLEVariant::OLEVariant() @@ -101,13 +101,13 @@ OLEVariant::OLEVariant() OLEVariant::OLEVariant(const VARIANT& varSrc) { ::VariantInit(this); - HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(&varSrc)); + HRESULT eRet = ::VariantCopy(this, &varSrc); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); } OLEVariant::OLEVariant(const OLEVariant& varSrc) { ::VariantInit(this); - HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(static_cast<const VARIANT*>(&varSrc))); + HRESULT eRet = ::VariantCopy(this, static_cast<const VARIANT*>(&varSrc)); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); } @@ -147,7 +147,7 @@ OLEVariant::OLEVariant(const css::util::DateTime& x ) vt = VT_DATE; dblVal = ::dbtools::DBTypeConversion::toDouble(x,css::util::Date(30,12,1899)); } -OLEVariant::OLEVariant(const float &x) +OLEVariant::OLEVariant(float x) { VariantInit(this); vt = VT_R4; @@ -187,7 +187,7 @@ OLEVariant::OLEVariant(const css::uno::Sequence< sal_Int8 >& x) OLEVariant& OLEVariant::operator=(const OLEVariant& varSrc) { - HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(static_cast<const VARIANT*>(&varSrc))); + HRESULT eRet = ::VariantCopy(this, static_cast<const VARIANT*>(&varSrc)); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); return *this; } @@ -195,7 +195,7 @@ OLEVariant& OLEVariant::operator=(const OLEVariant& varSrc) OLEVariant& OLEVariant::operator=(const tagVARIANT& varSrc) { - HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(&varSrc)); + HRESULT eRet = ::VariantCopy(this, &varSrc); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); return *this; @@ -205,7 +205,7 @@ OLEVariant& OLEVariant::operator=(const tagVARIANT& varSrc) OLEVariant& OLEVariant::operator=(const VARIANT* pSrc) { - HRESULT eRet = ::VariantCopy(this, const_cast<VARIANT*>(pSrc)); + HRESULT eRet = ::VariantCopy(this, pSrc); OSL_ENSURE(eRet == S_OK,"Error while copying an ado variant!"); return *this; @@ -265,7 +265,7 @@ void OLEVariant::setCurrency(double aCur) vt = VT_CY; set(aCur*10000); } -void OLEVariant::setBool(sal_Bool b) +void OLEVariant::setBool(bool b) { HRESULT eRet = VariantClear(this); OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!"); @@ -328,8 +328,8 @@ void OLEVariant::setIDispatch(IDispatch* pDispInterface) } -sal_Bool OLEVariant::isNull() const { return (vt == VT_NULL); } -sal_Bool OLEVariant::isEmpty() const { return (vt == VT_EMPTY); } +bool OLEVariant::isNull() const { return (vt == VT_NULL); } +bool OLEVariant::isEmpty() const { return (vt == VT_EMPTY); } VARTYPE OLEVariant::getType() const { return vt; } @@ -346,7 +346,7 @@ css::util::DateTime OLEVariant::getDateTime() const return isNull() ? css::util::DateTime() : ::dbtools::DBTypeConversion::toDateTime(getDateAsDouble(),css::util::Date(30,12,1899)); } -VARIANT_BOOL OLEVariant::VariantBool(sal_Bool bEinBoolean) +VARIANT_BOOL OLEVariant::VariantBool(bool bEinBoolean) { return (bEinBoolean ? VARIANT_TRUE : VARIANT_FALSE); } @@ -395,7 +395,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) // If pDest is NULL, convert type in place - if (pSrc == NULL) + if (pSrc == nullptr) pSrc = this; if ( ( this != pSrc ) @@ -403,7 +403,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) ) { if ( FAILED( ::VariantChangeType( static_cast< VARIANT* >( this ), - const_cast< VARIANT* >( static_cast< const VARIANT* >( pSrc ) ), + static_cast< const VARIANT* >( pSrc ), 0, vartype ) ) ) { @@ -411,7 +411,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) const OUString sError( aResources.getResourceString(STR_TYPE_NOT_CONVERT)); throw css::sdbc::SQLException( sError, - NULL, + nullptr, OUString( "S1000" ), 1000, css::uno::Any() @@ -462,18 +462,18 @@ css::uno::Sequence< sal_Int8 > OLEVariant::getByteSequence() const return aRet; } -sal_Bool OLEVariant::getBool() const +bool OLEVariant::getBool() const { if (V_VT(this) == VT_BOOL) - return V_BOOL(this) == VARIANT_TRUE ? sal_True : sal_False; + return V_BOOL(this) == VARIANT_TRUE; if(isNull()) - return sal_False; + return false; OLEVariant varDest; varDest.ChangeType(VT_BOOL, this); - return V_BOOL(&varDest) == VARIANT_TRUE ? sal_True : sal_False; + return V_BOOL(&varDest) == VARIANT_TRUE; } IUnknown* OLEVariant::getIUnknown() const @@ -483,7 +483,7 @@ IUnknown* OLEVariant::getIUnknown() const return V_UNKNOWN(this); } if(isNull()) - return NULL; + return nullptr; OLEVariant varDest; @@ -501,7 +501,7 @@ IDispatch* OLEVariant::getIDispatch() const } if(isNull()) - return NULL; + return nullptr; OLEVariant varDest; @@ -650,7 +650,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const return V_ARRAY(this); if(isNull()) - return 0; + return nullptr; OLEVariant varDest; varDest.ChangeType((VT_ARRAY|VT_UI1), this); diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx index ac5773348b81..8f6b1d1bfdd6 100644 --- a/connectivity/source/drivers/ado/Aservices.cxx +++ b/connectivity/source/drivers/ado/Aservices.cxx @@ -46,13 +46,13 @@ struct ProviderRequest void* pServiceManager, sal_Char const* pImplementationName ) - : xServiceManager(reinterpret_cast<XMultiServiceFactory*>(pServiceManager)) + : xServiceManager(static_cast<XMultiServiceFactory*>(pServiceManager)) , sImplementationName(OUString::createFromAscii(pImplementationName)) { } inline - sal_Bool CREATE_PROVIDER( + bool CREATE_PROVIDER( const OUString& Implname, const Sequence< OUString > & Services, ::cppu::ComponentInstantiation Factory, @@ -60,13 +60,13 @@ struct ProviderRequest ) { if (!xRet.is() && (Implname == sImplementationName)) - try - { - xRet = creator( xServiceManager, sImplementationName,Factory, Services,0); - } - catch(...) - { - } + try + { + xRet = creator( xServiceManager, sImplementationName,Factory, Services,nullptr); + } + catch(...) + { + } return xRet.is(); } @@ -79,7 +79,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ado_component_getFactory( void* pServiceManager, void* /*pRegistryKey*/) { - void* pRet = 0; + void* pRet = nullptr; if (pServiceManager) { ProviderRequest aReq(pServiceManager,pImplementationName); diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index 22a2a3826581..b37610dd1e56 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -37,10 +37,10 @@ void WpADOCatalog::Create() { _ADOCatalog* pCommand; HRESULT hr = CoCreateInstance(ADOS::CLSID_ADOCATALOG_25, - NULL, + nullptr, CLSCTX_INPROC_SERVER, ADOS::IID_ADOCATALOG_25, - (void**)&pCommand ); + reinterpret_cast<void**>(&pCommand) ); if( !FAILED( hr ) ) @@ -50,7 +50,7 @@ void WpADOCatalog::Create() WpADOProperties WpADOConnection::get_Properties() const { - ADOProperties* pProps=NULL; + ADOProperties* pProps=nullptr; pInterface->get_Properties(&pProps); WpADOProperties aProps; aProps.setWithOutAddRef(pProps); @@ -65,11 +65,11 @@ OUString WpADOConnection::GetConnectionString() const return aBSTR.asOUString(); } -sal_Bool WpADOConnection::PutConnectionString(const OUString &aCon) const +bool WpADOConnection::PutConnectionString(const OUString &aCon) const { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(aCon); - sal_Bool bErg = SUCCEEDED(pInterface->put_ConnectionString(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_ConnectionString(bstr.asBSTR())); return bErg; } @@ -102,50 +102,50 @@ void WpADOConnection::PutConnectionTimeout(sal_Int32 nRet) pInterface->put_ConnectionTimeout(nRet); } -sal_Bool WpADOConnection::Close( ) +bool WpADOConnection::Close( ) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->Close())); } -sal_Bool WpADOConnection::Execute(const OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset) +bool WpADOConnection::Execute(const OUString& CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset) { OSL_ENSURE(pInterface,"Interface is null!"); - OLEString sStr1(_CommandText); - sal_Bool bErg = SUCCEEDED(pInterface->Execute(sStr1.asBSTR(),&RecordsAffected,Options,(_ADORecordset**)ppiRset)); + OLEString sStr1(CommandText); + bool bErg = SUCCEEDED(pInterface->Execute(sStr1.asBSTR(),&RecordsAffected,Options,reinterpret_cast<_ADORecordset**>(ppiRset))); return bErg; } -sal_Bool WpADOConnection::BeginTrans() +bool WpADOConnection::BeginTrans() { OSL_ENSURE(pInterface,"Interface is null!"); sal_Int32 nIso=0; return SUCCEEDED(pInterface->BeginTrans(&nIso)); } -sal_Bool WpADOConnection::CommitTrans( ) +bool WpADOConnection::CommitTrans( ) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->CommitTrans()); } -sal_Bool WpADOConnection::RollbackTrans( ) +bool WpADOConnection::RollbackTrans( ) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->RollbackTrans()); } -sal_Bool WpADOConnection::Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options) +bool WpADOConnection::Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString sStr1(ConnectionString); OLEString sStr2(UserID); OLEString sStr3(Password); - sal_Bool bErg = SUCCEEDED(pInterface->Open(sStr1.asBSTR(),sStr2.asBSTR(),sStr3.asBSTR(),Options)); + bool bErg = SUCCEEDED(pInterface->Open(sStr1.asBSTR(),sStr2.asBSTR(),sStr3.asBSTR(),Options)); return bErg; } -sal_Bool WpADOConnection::GetErrors(ADOErrors** pErrors) +bool WpADOConnection::GetErrors(ADOErrors** pErrors) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->get_Errors(pErrors)); @@ -158,11 +158,11 @@ OUString WpADOConnection::GetDefaultDatabase() const return aBSTR.asOUString(); } -sal_Bool WpADOConnection::PutDefaultDatabase(const OUString& _bstr) +bool WpADOConnection::PutDefaultDatabase(const OUString& _bstr) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_bstr); - sal_Bool bErg = SUCCEEDED(pInterface->put_DefaultDatabase(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_DefaultDatabase(bstr.asBSTR())); return bErg; } @@ -175,7 +175,7 @@ IsolationLevelEnum WpADOConnection::get_IsolationLevel() const return eNum; } -sal_Bool WpADOConnection::put_IsolationLevel(const IsolationLevelEnum& eNum) +bool WpADOConnection::put_IsolationLevel(const IsolationLevelEnum& eNum) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_IsolationLevel(eNum)); @@ -189,7 +189,7 @@ sal_Int32 WpADOConnection::get_Attributes() const return nRet; } -sal_Bool WpADOConnection::put_Attributes(sal_Int32 nRet) +bool WpADOConnection::put_Attributes(sal_Int32 nRet) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_Attributes(nRet)); @@ -203,7 +203,7 @@ CursorLocationEnum WpADOConnection::get_CursorLocation() const return eNum; } -sal_Bool WpADOConnection::put_CursorLocation(const CursorLocationEnum &eNum) +bool WpADOConnection::put_CursorLocation(const CursorLocationEnum &eNum) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_CursorLocation(eNum)); @@ -217,7 +217,7 @@ ConnectModeEnum WpADOConnection::get_Mode() const return eNum; } -sal_Bool WpADOConnection::put_Mode(const ConnectModeEnum &eNum) +bool WpADOConnection::put_Mode(const ConnectModeEnum &eNum) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_Mode(eNum)); @@ -230,7 +230,7 @@ OUString WpADOConnection::get_Provider() const return aBSTR.asOUString(); } -sal_Bool WpADOConnection::put_Provider(const OUString& _bstr) +bool WpADOConnection::put_Provider(const OUString& _bstr) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_bstr); @@ -245,7 +245,7 @@ sal_Int32 WpADOConnection::get_State() const return nRet; } -sal_Bool WpADOConnection::OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OLEVariant& SchemaID,ADORecordset**pprset) +bool WpADOConnection::OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OLEVariant& SchemaID,ADORecordset**pprset) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->OpenSchema(eNum,Restrictions,SchemaID,pprset)); @@ -259,13 +259,13 @@ OUString WpADOConnection::get_Version() const return aBSTR.asOUString(); } -sal_Bool WpADOCommand::putref_ActiveConnection( WpADOConnection *pCon) +bool WpADOCommand::putref_ActiveConnection( WpADOConnection *pCon) { OSL_ENSURE(pInterface,"Interface is null!"); if(pCon) return SUCCEEDED(pInterface->putref_ActiveConnection(pCon->pInterface)); else - return SUCCEEDED(pInterface->putref_ActiveConnection(NULL)); + return SUCCEEDED(pInterface->putref_ActiveConnection(nullptr)); } void WpADOCommand::put_ActiveConnection(/* [in] */ const OLEVariant& vConn) @@ -276,23 +276,23 @@ void WpADOCommand::put_ActiveConnection(/* [in] */ const OLEVariant& vConn) void WpADOCommand::Create() { - IClassFactory2* pInterface2 = NULL; + IClassFactory2* pInterface2 = nullptr; HRESULT hr = CoGetClassObject( ADOS::CLSID_ADOCOMMAND_21, CLSCTX_INPROC_SERVER, - NULL, + nullptr, IID_IClassFactory2, - (void**)&pInterface2 ); + reinterpret_cast<void**>(&pInterface2) ); if( !FAILED( hr ) ) { - ADOCommand* pCommand=NULL; - IUnknown* pOuter=NULL; + ADOCommand* pCommand=nullptr; + IUnknown* pOuter=nullptr; hr = pInterface2->CreateInstanceLic( pOuter, - NULL, + nullptr, ADOS::IID_ADOCOMMAND_21, ADOS::GetKeyStr().asBSTR(), - (void**) &pCommand); + reinterpret_cast<void**>(&pCommand)); if( !FAILED( hr ) ) { @@ -320,11 +320,11 @@ OUString WpADOCommand::get_CommandText() const return aBSTR.asOUString(); } -sal_Bool WpADOCommand::put_CommandText(const OUString &aCon) +bool WpADOCommand::put_CommandText(const OUString &aCon) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(aCon); - sal_Bool bErg = SUCCEEDED(pInterface->put_CommandText(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_CommandText(bstr.asBSTR())); return bErg; } @@ -343,7 +343,7 @@ void WpADOCommand::put_CommandTimeout(sal_Int32 nRet) pInterface->put_CommandTimeout(nRet); } -sal_Bool WpADOCommand::get_Prepared() const +bool WpADOCommand::get_Prepared() const { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL bPrepared = VARIANT_FALSE; @@ -351,13 +351,13 @@ sal_Bool WpADOCommand::get_Prepared() const return bPrepared == VARIANT_TRUE; } -sal_Bool WpADOCommand::put_Prepared(VARIANT_BOOL bPrepared) const +bool WpADOCommand::put_Prepared(VARIANT_BOOL bPrepared) const { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_Prepared(bPrepared)); } -sal_Bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Params,long Options, ADORecordset** ppiRset) +bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Params,long Options, ADORecordset** ppiRset) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->Execute(&RecordsAffected,&Params,Options,ppiRset)); @@ -366,22 +366,22 @@ sal_Bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Params,lo ADOParameter* WpADOCommand::CreateParameter(const OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value) { OSL_ENSURE(pInterface,"Interface is null!"); - ADOParameter* pPara = NULL; + ADOParameter* pPara = nullptr; OLEString bstr(_bstr); - sal_Bool bErg = SUCCEEDED(pInterface->CreateParameter(bstr.asBSTR(),Type,Direction,nSize,Value,&pPara)); + bool bErg = SUCCEEDED(pInterface->CreateParameter(bstr.asBSTR(),Type,Direction,nSize,Value,&pPara)); - return bErg ? pPara : NULL; + return bErg ? pPara : nullptr; } ADOParameters* WpADOCommand::get_Parameters() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOParameters* pPara=NULL; + ADOParameters* pPara=nullptr; pInterface->get_Parameters(&pPara); return pPara; } -sal_Bool WpADOCommand::put_CommandType( /* [in] */ CommandTypeEnum lCmdType) +bool WpADOCommand::put_CommandType( /* [in] */ CommandTypeEnum lCmdType) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_CommandType(lCmdType)); @@ -404,15 +404,15 @@ OUString WpADOCommand::GetName() const return aBSTR.asOUString(); } -sal_Bool WpADOCommand::put_Name(const OUString& _Name) +bool WpADOCommand::put_Name(const OUString& Name) { OSL_ENSURE(pInterface,"Interface is null!"); - OLEString bstr(_Name); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + OLEString bstr(Name); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); return bErg; } -sal_Bool WpADOCommand::Cancel() +bool WpADOCommand::Cancel() { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->Cancel()); @@ -460,7 +460,7 @@ OUString WpADOError::GetDescription() const WpADOProperties WpADOField::get_Properties() { OSL_ENSURE(pInterface,"Interface is null!"); - ADOProperties* pProps = NULL; + ADOProperties* pProps = nullptr; pInterface->get_Properties(&pProps); WpADOProperties aProps; @@ -521,7 +521,7 @@ OUString WpADOField::GetName() const { OSL_ENSURE(pInterface,"Interface is null!"); aValVar.setEmpty(); - sal_Bool bOk = SUCCEEDED(pInterface->get_Value(&aValVar)); + bool bOk = SUCCEEDED(pInterface->get_Value(&aValVar)); (void)bOk; } @@ -533,7 +533,7 @@ OUString WpADOField::GetName() const return aValVar; } - sal_Bool WpADOField::PutValue(const OLEVariant& aVariant) +bool WpADOField::PutValue(const OLEVariant& aVariant) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Value(aVariant))); @@ -555,10 +555,10 @@ sal_Int32 WpADOField::GetPrecision() const return eType; } - sal_Bool WpADOField::AppendChunk(const OLEVariant& _Variant) +bool WpADOField::AppendChunk(const OLEVariant& Variant) { OSL_ENSURE(pInterface,"Interface is null!"); - return (SUCCEEDED(pInterface->AppendChunk(_Variant))); + return (SUCCEEDED(pInterface->AppendChunk(Variant))); } OLEVariant WpADOField::GetChunk(long Length) const @@ -603,13 +603,13 @@ OLEVariant WpADOField::GetUnderlyingValue() const pInterface->get_UnderlyingValue(&aValVar); } - sal_Bool WpADOField::PutPrecision(sal_Int8 _prec) +bool WpADOField::PutPrecision(sal_Int8 _prec) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Precision(_prec))); } - sal_Bool WpADOField::PutNumericScale(sal_Int8 _prec) +bool WpADOField::PutNumericScale(sal_Int8 _prec) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_NumericScale(_prec))); @@ -621,13 +621,13 @@ OLEVariant WpADOField::GetUnderlyingValue() const pInterface->put_Type(eType); } - sal_Bool WpADOField::PutDefinedSize(sal_Int32 _nDefSize) +bool WpADOField::PutDefinedSize(sal_Int32 _nDefSize) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_DefinedSize(_nDefSize))); } - sal_Bool WpADOField::PutAttributes(sal_Int32 _nDefSize) +bool WpADOField::PutAttributes(sal_Int32 _nDefSize) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Attributes(_nDefSize))); @@ -648,7 +648,7 @@ void WpADOProperty::GetValue(OLEVariant &aValVar) const pInterface->get_Value(&aValVar); } -sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar) +bool WpADOProperty::PutValue(const OLEVariant &aValVar) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Value(aValVar))); @@ -678,29 +678,29 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar) return eADOSFieldAttributes; } - sal_Bool WpADOProperty::PutAttributes(sal_Int32 _nDefSize) +bool WpADOProperty::PutAttributes(sal_Int32 _nDefSize) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Attributes(_nDefSize))); } void WpADORecordset::Create() { - IClassFactory2* pInterface2 = NULL; + IClassFactory2* pInterface2 = nullptr; HRESULT hr = CoGetClassObject( ADOS::CLSID_ADORECORDSET_21, CLSCTX_INPROC_SERVER, - NULL, + nullptr, IID_IClassFactory2, - (void**)&pInterface2 ); + reinterpret_cast<void**>(&pInterface2) ); if( !FAILED( hr ) ) { - ADORecordset *pRec = NULL; - IUnknown *pOuter = NULL; + ADORecordset *pRec = nullptr; + IUnknown *pOuter = nullptr; hr = pInterface2->CreateInstanceLic( pOuter, - NULL, + nullptr, ADOS::IID_ADORECORDSET_21, ADOS::GetKeyStr().asBSTR(), - (void**) &pRec); + reinterpret_cast<void**>(&pRec)); if( !FAILED( hr ) ) { @@ -712,7 +712,7 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar) } } - sal_Bool WpADORecordset::Open( +bool WpADORecordset::Open( /* [optional][in] */ VARIANT Source, /* [optional][in] */ VARIANT ActiveConnection, /* [defaultvalue][in] */ CursorTypeEnum CursorType, @@ -739,7 +739,7 @@ void WpADORecordset::Close() pInterface->Close(); } - sal_Bool WpADORecordset::Cancel() const +bool WpADORecordset::Cancel() const { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->Cancel())); @@ -753,7 +753,7 @@ void WpADORecordset::Close() return nState; } - sal_Bool WpADORecordset::Supports( /* [in] */ CursorOptionEnum CursorOptions) +bool WpADORecordset::Supports( /* [in] */ CursorOptionEnum CursorOptions) { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL bSupports=VARIANT_FALSE; @@ -803,7 +803,7 @@ CompareEnum WpADORecordset::CompareBookmarks(const OLEVariant& left,const OLEVar return eNum; } - sal_Bool WpADORecordset::SetBookmark(const OLEVariant &pSafeAr) +bool WpADORecordset::SetBookmark(const OLEVariant &pSafeAr) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_Bookmark(pSafeAr)); @@ -813,7 +813,7 @@ CompareEnum WpADORecordset::CompareBookmarks(const OLEVariant& left,const OLEVar WpADOFields WpADORecordset::GetFields() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOFields* pFields=NULL; + ADOFields* pFields=nullptr; pInterface->get_Fields(&pFields); WpADOFields aFields; aFields.setWithOutAddRef(pFields); @@ -821,13 +821,13 @@ WpADOFields WpADORecordset::GetFields() const } - sal_Bool WpADORecordset::Move(sal_Int32 nRows, VARIANT aBmk) {return pInterface && SUCCEEDED(pInterface->Move(nRows, aBmk));} - sal_Bool WpADORecordset::MoveNext() {return pInterface && SUCCEEDED(pInterface->MoveNext());} - sal_Bool WpADORecordset::MovePrevious() {return pInterface && SUCCEEDED(pInterface->MovePrevious());} - sal_Bool WpADORecordset::MoveFirst() {return pInterface && SUCCEEDED(pInterface->MoveFirst());} - sal_Bool WpADORecordset::MoveLast() {return pInterface && SUCCEEDED(pInterface->MoveLast());} +bool WpADORecordset::Move(sal_Int32 nRows, VARIANT aBmk) {return pInterface && SUCCEEDED(pInterface->Move(nRows, aBmk));} +bool WpADORecordset::MoveNext() {return pInterface && SUCCEEDED(pInterface->MoveNext());} +bool WpADORecordset::MovePrevious() {return pInterface && SUCCEEDED(pInterface->MovePrevious());} +bool WpADORecordset::MoveFirst() {return pInterface && SUCCEEDED(pInterface->MoveFirst());} +bool WpADORecordset::MoveLast() {return pInterface && SUCCEEDED(pInterface->MoveLast());} - sal_Bool WpADORecordset::IsAtBOF() const +bool WpADORecordset::IsAtBOF() const { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL bIsAtBOF=VARIANT_FALSE; @@ -835,7 +835,7 @@ WpADOFields WpADORecordset::GetFields() const return bIsAtBOF == VARIANT_TRUE; } - sal_Bool WpADORecordset::IsAtEOF() const +bool WpADORecordset::IsAtEOF() const { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL bIsAtEOF=VARIANT_FALSE; @@ -843,25 +843,25 @@ WpADOFields WpADORecordset::GetFields() const return bIsAtEOF == VARIANT_TRUE; } - sal_Bool WpADORecordset::Delete(AffectEnum eNum) +bool WpADORecordset::Delete(AffectEnum eNum) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->Delete(eNum)); } - sal_Bool WpADORecordset::AddNew(const OLEVariant &FieldList,const OLEVariant &Values) +bool WpADORecordset::AddNew(const OLEVariant &FieldList,const OLEVariant &Values) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->AddNew(FieldList,Values)); } - sal_Bool WpADORecordset::Update(const OLEVariant &FieldList,const OLEVariant &Values) +bool WpADORecordset::Update(const OLEVariant &FieldList,const OLEVariant &Values) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->Update(FieldList,Values)); } - sal_Bool WpADORecordset::CancelUpdate() +bool WpADORecordset::CancelUpdate() { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->CancelUpdate()); @@ -870,74 +870,74 @@ WpADOFields WpADORecordset::GetFields() const WpADOProperties WpADORecordset::get_Properties() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOProperties* pProps=NULL; + ADOProperties* pProps=nullptr; pInterface->get_Properties(&pProps); WpADOProperties aProps; aProps.setWithOutAddRef(pProps); return aProps; } - sal_Bool WpADORecordset::NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset) +bool WpADORecordset::NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->NextRecordset(&RecordsAffected,ppiRset)); } - sal_Bool WpADORecordset::get_RecordCount(ADO_LONGPTR &_nRet) const +bool WpADORecordset::get_RecordCount(ADO_LONGPTR &_nRet) const { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->get_RecordCount(&_nRet)); } - sal_Bool WpADORecordset::get_MaxRecords(ADO_LONGPTR &_nRet) const +bool WpADORecordset::get_MaxRecords(ADO_LONGPTR &_nRet) const { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->get_MaxRecords(&_nRet)); } - sal_Bool WpADORecordset::put_MaxRecords(ADO_LONGPTR _nRet) +bool WpADORecordset::put_MaxRecords(ADO_LONGPTR _nRet) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_MaxRecords(_nRet)); } - sal_Bool WpADORecordset::get_CursorType(CursorTypeEnum &_nRet) const +bool WpADORecordset::get_CursorType(CursorTypeEnum &_nRet) const { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->get_CursorType(&_nRet)); } - sal_Bool WpADORecordset::put_CursorType(CursorTypeEnum _nRet) +bool WpADORecordset::put_CursorType(CursorTypeEnum _nRet) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_CursorType(_nRet)); } - sal_Bool WpADORecordset::get_LockType(LockTypeEnum &_nRet) const +bool WpADORecordset::get_LockType(LockTypeEnum &_nRet) const { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->get_LockType(&_nRet)); } - sal_Bool WpADORecordset::put_LockType(LockTypeEnum _nRet) +bool WpADORecordset::put_LockType(LockTypeEnum _nRet) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_LockType(_nRet)); } - sal_Bool WpADORecordset::get_CacheSize(sal_Int32 &_nRet) const +bool WpADORecordset::get_CacheSize(sal_Int32 &_nRet) const { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->get_CacheSize(&_nRet)); } - sal_Bool WpADORecordset::put_CacheSize(sal_Int32 _nRet) +bool WpADORecordset::put_CacheSize(sal_Int32 _nRet) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_CacheSize(_nRet)); } - sal_Bool WpADORecordset::UpdateBatch(AffectEnum AffectRecords) +bool WpADORecordset::UpdateBatch(AffectEnum AffectRecords) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->UpdateBatch(AffectRecords)); @@ -1011,17 +1011,17 @@ void WpADOParameter::put_Type(const DataTypeEnum& _eType) return aValVar; } -sal_Bool WpADOParameter::PutValue(const OLEVariant& aVariant) +bool WpADOParameter::PutValue(const OLEVariant& aVariant) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Value(aVariant))); } -sal_Bool WpADOParameter::AppendChunk(const OLEVariant& aVariant) +bool WpADOParameter::AppendChunk(const OLEVariant& aVariant) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->AppendChunk(aVariant))); } -sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize) +bool WpADOParameter::put_Size(sal_Int32 _nSize) { OSL_ENSURE(pInterface,"Interface is null!"); return (SUCCEEDED(pInterface->put_Size(_nSize))); @@ -1047,14 +1047,14 @@ void WpADOColumn::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); (void)bErg; } void WpADOColumn::put_RelatedColumn(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_RelatedColumn(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_RelatedColumn(bstr.asBSTR())); (void)bErg; } @@ -1129,7 +1129,7 @@ ColumnAttributesEnum WpADOColumn::get_Attributes() const return eNum; } -sal_Bool WpADOColumn::put_Attributes(const ColumnAttributesEnum& _eNum) +bool WpADOColumn::put_Attributes(const ColumnAttributesEnum& _eNum) { OSL_ENSURE(pInterface,"Interface is null!"); return SUCCEEDED(pInterface->put_Attributes(_eNum)); @@ -1138,7 +1138,7 @@ sal_Bool WpADOColumn::put_Attributes(const ColumnAttributesEnum& _eNum) WpADOProperties WpADOColumn::get_Properties() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOProperties* pProps = NULL; + ADOProperties* pProps = nullptr; pInterface->get_Properties(&pProps); WpADOProperties aProps; @@ -1158,7 +1158,7 @@ void WpADOKey::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); (void)bErg; } @@ -1188,7 +1188,7 @@ void WpADOKey::put_RelatedTable(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_RelatedTable(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_RelatedTable(bstr.asBSTR())); (void)bErg; } @@ -1223,7 +1223,7 @@ void WpADOKey::put_UpdateRule(const RuleEnum& _eNum) WpADOColumns WpADOKey::get_Columns() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOColumns* pCols = NULL; + ADOColumns* pCols = nullptr; pInterface->get_Columns(&pCols); WpADOColumns aCols; aCols.setWithOutAddRef(pCols); @@ -1242,11 +1242,11 @@ void WpADOIndex::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); (void)bErg; } -sal_Bool WpADOIndex::get_Clustered() const +bool WpADOIndex::get_Clustered() const { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL eNum = VARIANT_FALSE; @@ -1254,13 +1254,13 @@ sal_Bool WpADOIndex::get_Clustered() const return eNum == VARIANT_TRUE; } -void WpADOIndex::put_Clustered(sal_Bool _b) +void WpADOIndex::put_Clustered(bool _b) { OSL_ENSURE(pInterface,"Interface is null!"); pInterface->put_Clustered(_b ? VARIANT_TRUE : VARIANT_FALSE); } -sal_Bool WpADOIndex::get_Unique() const +bool WpADOIndex::get_Unique() const { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL eNum = VARIANT_FALSE; @@ -1268,13 +1268,13 @@ sal_Bool WpADOIndex::get_Unique() const return eNum == VARIANT_TRUE; } -void WpADOIndex::put_Unique(sal_Bool _b) +void WpADOIndex::put_Unique(bool _b) { OSL_ENSURE(pInterface,"Interface is null!"); pInterface->put_Unique(_b ? VARIANT_TRUE : VARIANT_FALSE); } -sal_Bool WpADOIndex::get_PrimaryKey() const +bool WpADOIndex::get_PrimaryKey() const { OSL_ENSURE(pInterface,"Interface is null!"); VARIANT_BOOL eNum = VARIANT_FALSE; @@ -1282,7 +1282,7 @@ sal_Bool WpADOIndex::get_PrimaryKey() const return eNum == VARIANT_TRUE; } -void WpADOIndex::put_PrimaryKey(sal_Bool _b) +void WpADOIndex::put_PrimaryKey(bool _b) { OSL_ENSURE(pInterface,"Interface is null!"); pInterface->put_PrimaryKey(_b ? VARIANT_TRUE : VARIANT_FALSE); @@ -1291,7 +1291,7 @@ void WpADOIndex::put_PrimaryKey(sal_Bool _b) WpADOColumns WpADOIndex::get_Columns() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOColumns* pCols = NULL; + ADOColumns* pCols = nullptr; pInterface->get_Columns(&pCols); WpADOColumns aCols; aCols.setWithOutAddRef(pCols); @@ -1307,7 +1307,7 @@ void WpADOCatalog::putref_ActiveConnection(IDispatch* pCon) WpADOTables WpADOCatalog::get_Tables() { OSL_ENSURE(pInterface,"Interface is null!"); - ADOTables* pRet = NULL; + ADOTables* pRet = nullptr; pInterface->get_Tables(&pRet); WpADOTables aRet; aRet.setWithOutAddRef(pRet); @@ -1317,7 +1317,7 @@ WpADOTables WpADOCatalog::get_Tables() WpADOViews WpADOCatalog::get_Views() { OSL_ENSURE(pInterface,"Interface is null!"); - ADOViews* pRet = NULL; + ADOViews* pRet = nullptr; pInterface->get_Views(&pRet); WpADOViews aRet; aRet.setWithOutAddRef(pRet); @@ -1327,7 +1327,7 @@ WpADOViews WpADOCatalog::get_Views() WpADOGroups WpADOCatalog::get_Groups() { OSL_ENSURE(pInterface,"Interface is null!"); - ADOGroups* pRet = NULL; + ADOGroups* pRet = nullptr; pInterface->get_Groups(&pRet); WpADOGroups aRet; aRet.setWithOutAddRef(pRet); @@ -1337,7 +1337,7 @@ WpADOGroups WpADOCatalog::get_Groups() WpADOUsers WpADOCatalog::get_Users() { OSL_ENSURE(pInterface,"Interface is null!"); - ADOUsers* pRet = NULL; + ADOUsers* pRet = nullptr; pInterface->get_Users(&pRet); WpADOUsers aRet; aRet.setWithOutAddRef(pRet); @@ -1347,7 +1347,7 @@ WpADOUsers WpADOCatalog::get_Users() ADOProcedures* WpADOCatalog::get_Procedures() { OSL_ENSURE(pInterface,"Interface is null!"); - ADOProcedures* pRet = NULL; + ADOProcedures* pRet = nullptr; pInterface->get_Procedures(&pRet); return pRet; } @@ -1364,7 +1364,7 @@ void WpADOTable::put_Name(const OUString& _rName) { OSL_ENSURE(pInterface,"Interface is null!"); OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); (void)bErg; } @@ -1379,7 +1379,7 @@ OUString WpADOTable::get_Type() const WpADOColumns WpADOTable::get_Columns() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOColumns* pCols = NULL; + ADOColumns* pCols = nullptr; pInterface->get_Columns(&pCols); WpADOColumns aCols; aCols.setWithOutAddRef(pCols); @@ -1389,7 +1389,7 @@ WpADOColumns WpADOTable::get_Columns() const WpADOIndexes WpADOTable::get_Indexes() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOIndexes* pCols = NULL; + ADOIndexes* pCols = nullptr; pInterface->get_Indexes(&pCols); WpADOIndexes aRet; aRet.setWithOutAddRef(pCols); @@ -1399,7 +1399,7 @@ WpADOIndexes WpADOTable::get_Indexes() const WpADOKeys WpADOTable::get_Keys() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOKeys* pCols = NULL; + ADOKeys* pCols = nullptr; pInterface->get_Keys(&pCols); WpADOKeys aRet; aRet.setWithOutAddRef(pCols); @@ -1409,7 +1409,7 @@ WpADOKeys WpADOTable::get_Keys() const WpADOCatalog WpADOTable::get_ParentCatalog() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOCatalog* pCat = NULL; + ADOCatalog* pCat = nullptr; pInterface->get_ParentCatalog(&pCat); WpADOCatalog aRet; aRet.setWithOutAddRef(pCat); @@ -1419,7 +1419,7 @@ WpADOCatalog WpADOTable::get_ParentCatalog() const WpADOProperties WpADOTable::get_Properties() const { OSL_ENSURE(pInterface,"Interface is null!"); - ADOProperties* pProps = NULL; + ADOProperties* pProps = nullptr; pInterface->get_Properties(&pProps); WpADOProperties aProps; aProps.setWithOutAddRef(pProps); @@ -1455,7 +1455,7 @@ OUString WpADOGroup::get_Name() const void WpADOGroup::put_Name(const OUString& _rName) { OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); (void)bErg; } @@ -1470,7 +1470,7 @@ RightsEnum WpADOGroup::GetPermissions( return Rights; } -sal_Bool WpADOGroup::SetPermissions( +bool WpADOGroup::SetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType, /* [in] */ ActionEnum Action, @@ -1483,7 +1483,7 @@ sal_Bool WpADOGroup::SetPermissions( WpADOUsers WpADOGroup::get_Users( ) { - ADOUsers* pRet = NULL; + ADOUsers* pRet = nullptr; pInterface->get_Users( &pRet); WpADOUsers aRet; aRet.setWithOutAddRef(pRet); @@ -1500,21 +1500,21 @@ OUString WpADOUser::get_Name() const void WpADOUser::put_Name(const OUString& _rName) { OLEString bstr(_rName); - sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); + bool bErg = SUCCEEDED(pInterface->put_Name(bstr.asBSTR())); (void)bErg; } -sal_Bool WpADOUser::ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd) +bool WpADOUser::ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd) { OLEString sStr1(_rPwd); OLEString sStr2(_rNewPwd); - sal_Bool bErg = SUCCEEDED(pInterface->ChangePassword(sStr1.asBSTR(),sStr2.asBSTR())); + bool bErg = SUCCEEDED(pInterface->ChangePassword(sStr1.asBSTR(),sStr2.asBSTR())); return bErg; } WpADOGroups WpADOUser::get_Groups() { - ADOGroups* pRet = NULL; + ADOGroups* pRet = nullptr; pInterface->get_Groups(&pRet); WpADOGroups aRet; aRet.setWithOutAddRef(pRet); @@ -1532,7 +1532,7 @@ RightsEnum WpADOUser::GetPermissions( return Rights; } -sal_Bool WpADOUser::SetPermissions( +bool WpADOUser::SetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType, /* [in] */ ActionEnum Action, @@ -1543,7 +1543,7 @@ sal_Bool WpADOUser::SetPermissions( return SUCCEEDED(pInterface->SetPermissions(Name,ObjectType,Action,Rights,adInheritNone,ObjectTypeId)); } -WpBase::WpBase() : pIUnknown(NULL) +WpBase::WpBase() : pIUnknown(nullptr) { } WpBase::WpBase(IDispatch* pInt) @@ -1596,7 +1596,7 @@ WpBase::~WpBase() if (pIUnknown) { pIUnknown->Release(); - pIUnknown = NULL; + pIUnknown = nullptr; } } @@ -1605,14 +1605,14 @@ void WpBase::clear() if (pIUnknown) { pIUnknown->Release(); - pIUnknown = NULL; + pIUnknown = nullptr; } } -sal_Bool WpBase::IsValid() const +bool WpBase::IsValid() const { - return pIUnknown != NULL; + return pIUnknown != nullptr; } WpBase::operator IDispatch*() { @@ -1623,7 +1623,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const css::uno::Any& catalog, co { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[6]; // Create SafeArray Bounds and initialize the array @@ -1654,7 +1654,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const css::uno::Any& catalog, co OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaForeignKeys,vsa,vtEmpty,&pRecordset); return pRecordset; } @@ -1663,7 +1663,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const css::uno::Any& catalog, co { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[6]; // Create SafeArray Bounds and initialize the array @@ -1694,7 +1694,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const css::uno::Any& catalog, co OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaForeignKeys,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -1705,7 +1705,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const css::uno::Any& catalog, con { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[3]; // Create SafeArray Bounds and initialize the array @@ -1733,7 +1733,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const css::uno::Any& catalog, con OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaPrimaryKeys,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -1741,11 +1741,11 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const css::uno::Any& catalog, con ADORecordset* WpADOConnection::getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, - sal_Bool /*unique*/, sal_Bool /*approximate*/ ) + bool /*unique*/, bool /*approximate*/ ) { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[5]; // Create SafeArray Bounds and initialize the array @@ -1776,7 +1776,7 @@ ADORecordset* WpADOConnection::getIndexInfo( OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaIndexes,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -1787,7 +1787,7 @@ ADORecordset* WpADOConnection::getTablePrivileges( const css::uno::Any& catalog, const OUString& tableNamePattern ) { SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[5]; // Create SafeArray Bounds and initialize the array @@ -1818,7 +1818,7 @@ ADORecordset* WpADOConnection::getTablePrivileges( const css::uno::Any& catalog, OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaTablePrivileges,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -1833,7 +1833,7 @@ ADORecordset* WpADOConnection::getCrossReference( const css::uno::Any& primaryCa { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[6]; // Create SafeArray Bounds and initialize the array @@ -1871,7 +1871,7 @@ ADORecordset* WpADOConnection::getCrossReference( const css::uno::Any& primaryCa OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaForeignKeys,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -1882,7 +1882,7 @@ ADORecordset* WpADOConnection::getProcedures( const css::uno::Any& catalog, const OUString& procedureNamePattern ) { SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[3]; // Create SafeArray Bounds and initialize the array @@ -1910,7 +1910,7 @@ ADORecordset* WpADOConnection::getProcedures( const css::uno::Any& catalog, OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaProcedures,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -1923,7 +1923,7 @@ ADORecordset* WpADOConnection::getProcedureColumns( const css::uno::Any& catalog { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[4]; // Create SafeArray Bounds and initialize the array @@ -1955,7 +1955,7 @@ ADORecordset* WpADOConnection::getProcedureColumns( const css::uno::Any& catalog OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaProcedureParameters,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -2019,7 +2019,7 @@ ADORecordset* WpADOConnection::getTables( const css::uno::Any& catalog, OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaTables,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -2032,7 +2032,7 @@ ADORecordset* WpADOConnection::getColumns( const css::uno::Any& catalog, { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[4]; // Create SafeArray Bounds and initialize the array @@ -2063,7 +2063,7 @@ ADORecordset* WpADOConnection::getColumns( const css::uno::Any& catalog, OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaColumns,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -2076,7 +2076,7 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const css::uno::Any& catalog { // Create elements used in the array SAFEARRAYBOUND rgsabound[1]; - SAFEARRAY *psa = NULL; + SAFEARRAY *psa = nullptr; OLEVariant varCriteria[4]; // Create SafeArray Bounds and initialize the array @@ -2106,7 +2106,7 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const css::uno::Any& catalog OLEVariant vsa; vsa.setArray(psa,VT_VARIANT); - ADORecordset *pRecordset = NULL; + ADORecordset *pRecordset = nullptr; OpenSchema(adSchemaColumnPrivileges,vsa,vtEmpty,&pRecordset); return pRecordset; @@ -2134,7 +2134,7 @@ ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/) OLEVariant aEmpty; aEmpty.setNoArg(); - ADORecordset *pRec=NULL; + ADORecordset *pRec=nullptr; OpenSchema(adSchemaProviderTypes,vsa,aEmpty,&pRec); return pRec; @@ -2143,14 +2143,14 @@ ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/) void WpADOColumn::put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject) { OSL_ENSURE(pInterface,"Interface is null!"); - sal_Bool bRet = SUCCEEDED(pInterface->put_ParentCatalog(ppvObject)); + bool bRet = SUCCEEDED(pInterface->put_ParentCatalog(ppvObject)); OSL_ENSURE(bRet,"Could not set ParentCatalog!"); } void WpADOTable::putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject) { OSL_ENSURE(pInterface,"Interface is null!"); - sal_Bool bRet = SUCCEEDED(pInterface->putref_ParentCatalog(ppvObject)); + bool bRet = SUCCEEDED(pInterface->putref_ParentCatalog(ppvObject)); OSL_ENSURE(bRet,"Could not set ParentCatalog!"); } @@ -2165,7 +2165,7 @@ void OTools::putValue(const WpADOProperties& _rProps,const OLEVariant &_aPositio WpADOProperty aProp(_rProps.GetItem(_aPosition)); if ( aProp.IsValid() ) { - sal_Bool bRet = aProp.PutValue(_aValVar); + bool bRet = aProp.PutValue(_aValVar); OSL_ENSURE(bRet,"Could not put value!"); } } diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index a36f3260685e..51498dacfd24 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -185,9 +185,9 @@ const int JET_ENGINETYPE_PARADOX7X = 53; const int JET_ENGINETYPE_TEXT1X = 60; const int JET_ENGINETYPE_HTML1X = 70; -sal_Bool ADOS::isJetEngine(sal_Int32 _nEngineType) +bool ADOS::isJetEngine(sal_Int32 _nEngineType) { - sal_Bool bRet = sal_False; + bool bRet = false; switch(_nEngineType) { case JET_ENGINETYPE_UNKNOWN: @@ -214,7 +214,7 @@ sal_Bool ADOS::isJetEngine(sal_Int32 _nEngineType) case JET_ENGINETYPE_PARADOX7X: case JET_ENGINETYPE_TEXT1X: case JET_ENGINETYPE_HTML1X: - bRet = sal_True; + bRet = true; break; } return bRet; @@ -310,14 +310,14 @@ WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) thr if ( !_pRecordSet ) return WpADOField(); - ADOFields* pFields = NULL; + ADOFields* pFields = nullptr; _pRecordSet->get_Fields(&pFields); WpOLEAppendCollection<ADOFields, ADOField, WpADOField> aFields(pFields); if(_nColumnIndex <= 0 || _nColumnIndex > aFields.GetItemCount()) - ::dbtools::throwInvalidIndexException(NULL); + ::dbtools::throwInvalidIndexException(nullptr); WpADOField aField(aFields.GetItem(_nColumnIndex-1)); if(!aField.IsValid()) - ::dbtools::throwInvalidIndexException(NULL); + ::dbtools::throwInvalidIndexException(nullptr); return aField; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index c2c4c3906a49..65ba48c2ccd2 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -68,9 +68,9 @@ namespace static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = { #if defined(_WIN32) - { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, - { "Mozilla/Firefox/", NULL, NULL, NULL }, - { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } + { "Mozilla/SeaMonkey/", nullptr, nullptr, nullptr }, + { "Mozilla/Firefox/", nullptr, nullptr, nullptr }, + { "Thunderbird/", "Mozilla/Thunderbird/", nullptr, nullptr } #elif defined(MACOSX) { "../Mozilla/SeaMonkey/", nullptr, nullptr, nullptr }, { "Firefox/", nullptr, nullptr, nullptr }, diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx index 71c3353d3092..ed35e9639b4c 100644 --- a/connectivity/source/inc/ado/ACallableStatement.hxx +++ b/connectivity/source/inc/ado/ACallableStatement.hxx @@ -40,9 +40,9 @@ namespace connectivity OLEVariant m_aValue; public: DECLARE_SERVICE_INFO(); - virtual ~OCallableStatement() {} ; + virtual ~OCallableStatement() override {} ; // a Constructor, that is needed for when Returning the Object is needed: - OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql ); + OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql ); virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; virtual void SAL_CALL acquire() throw() override; diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx index 313467cd95fc..7475e66f8a5c 100644 --- a/connectivity/source/inc/ado/ACatalog.hxx +++ b/connectivity/source/inc/ado/ACatalog.hxx @@ -34,14 +34,14 @@ namespace connectivity OConnection* m_pConnection; public: - virtual void refreshTables(); - virtual void refreshViews() ; - virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshTables() override; + virtual void refreshViews() override; + virtual void refreshGroups() override; + virtual void refreshUsers() override; public: OCatalog(_ADOCatalog* _pCatalog,OConnection* _pCon); - ~OCatalog(); + ~OCatalog() override; OConnection* getConnection() const { return m_pConnection; } sdbcx::OCollection* getPrivateTables() const { return m_pTables; } diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx index 4eb7242222ae..969eed384fdf 100644 --- a/connectivity/source/inc/ado/AColumn.hxx +++ b/connectivity/source/inc/ado/AColumn.hxx @@ -34,7 +34,7 @@ namespace connectivity WpADOColumn m_aColumn; OConnection* m_pConnection; OUString m_ReferencedColumn; - sal_Bool m_IsAscending; + bool m_IsAscending; void fillPropertyValues(); protected: @@ -42,16 +42,16 @@ namespace connectivity sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + throw (css::uno::Exception) override; public: - OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn); - OAdoColumn(sal_Bool _bCase,OConnection* _pConnection); + OAdoColumn(bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn); + OAdoColumn(bool _bCase,OConnection* _pConnection); // ODescriptor - virtual void construct(); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void construct() override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); WpADOColumn getColumnImpl() const; diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index 61e413473972..04488a5c835a 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.hxx @@ -36,17 +36,17 @@ namespace connectivity WpADOColumns m_aCollection; OConnection* m_pConnection; - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const WpADOColumns& _rCollection, - sal_Bool _bCase, + bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pConnection(_pConnection) diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 2f395f4fc246..c2832061da8f 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -66,8 +66,8 @@ namespace connectivity WpADOConnection* m_pAdoConnection; OCatalog* m_pCatalog; sal_Int32 m_nEngineType; - sal_Bool m_bClosed; - sal_Bool m_bAutocommit; + bool m_bClosed; + bool m_bAutocommit; protected: void buildTypeInfo() throw( css::sdbc::SQLException); @@ -75,7 +75,7 @@ namespace connectivity OConnection(ODriver* _pDriver) throw(css::sdbc::SQLException, css::uno::RuntimeException); // OConnection(const SQLHANDLE _pConnectionHandle); - ~OConnection(); + ~OConnection() override; void construct(const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); void closeAllStatements () throw( css::sdbc::SQLException); @@ -124,7 +124,7 @@ namespace connectivity { if ( m_xCatalog.get().is() ) return m_pCatalog; - return NULL; + return nullptr; } sal_Int32 getEngineType() const { return m_nEngineType; } @@ -135,7 +135,7 @@ namespace connectivity const OUString& _sTypeName, sal_Int32 _nPrecision, sal_Int32 _nScale, - sal_Bool& _brForceToType); + bool& _brForceToType); }; } } diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index 760d2a8bf436..8bd545219249 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -35,12 +35,12 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaDataBase { - typedef struct _LiteralInfo + struct LiteralInfo { OUString pwszLiteralValue; sal_uInt32 cchMaxLen; - sal_Bool fSupported; - } LiteralInfo; + bool fSupported; + }; ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; WpADOConnection* m_pADOConnection; @@ -49,168 +49,168 @@ namespace connectivity void fillLiterals(); // get information out of rowset sal_Int32 getMaxSize(sal_uInt32 _nId); - sal_Bool isCapable(sal_uInt32 _nId); + bool isCapable(sal_uInt32 _nId); OUString getLiteral(sal_uInt32 _nProperty); // get info out of propertyst OUString getStringProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getInt32Property(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException); - sal_Bool getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException); + bool getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw(); + virtual css::uno::Reference< css::sdbc::XResultSet > impl_getTypeInfo_throw() override; // cached database information - virtual OUString impl_getIdentifierQuoteString_throw( ); - virtual bool impl_isCatalogAtStart_throw( ); - virtual OUString impl_getCatalogSeparator_throw( ); - virtual bool impl_supportsCatalogsInTableDefinitions_throw( ); - virtual bool impl_supportsSchemasInTableDefinitions_throw( ) ; - virtual bool impl_supportsCatalogsInDataManipulation_throw( ); - virtual bool impl_supportsSchemasInDataManipulation_throw( ) ; - virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ); - virtual bool impl_supportsAlterTableWithAddColumn_throw( ); - virtual bool impl_supportsAlterTableWithDropColumn_throw( ); - virtual sal_Int32 impl_getMaxStatements_throw( ); - virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); - virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ); + virtual OUString impl_getIdentifierQuoteString_throw( ) override; + virtual bool impl_isCatalogAtStart_throw( ) override; + virtual OUString impl_getCatalogSeparator_throw( ) override; + virtual bool impl_supportsCatalogsInTableDefinitions_throw( ) override; + virtual bool impl_supportsSchemasInTableDefinitions_throw( ) override; + virtual bool impl_supportsCatalogsInDataManipulation_throw( ) override; + virtual bool impl_supportsSchemasInDataManipulation_throw( ) override; + virtual bool impl_supportsMixedCaseQuotedIdentifiers_throw( ) override; + virtual bool impl_supportsAlterTableWithAddColumn_throw( ) override; + virtual bool impl_supportsAlterTableWithDropColumn_throw( ) override; + virtual sal_Int32 impl_getMaxStatements_throw( ) override; + virtual sal_Int32 impl_getMaxTablesInSelect_throw( ) override; + virtual bool impl_storesMixedCaseQuotedIdentifiers_throw( ) override; public: ODatabaseMetaData(OConnection* _pCon); // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + + virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 0657f29d4bcc..316c980e6957 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -71,15 +71,15 @@ namespace connectivity css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; OLEVariant m_aValue; sal_Int32 m_nRowPos; - sal_Bool m_bWasNull; - sal_Bool m_bEOF; - sal_Bool m_bOnFirstAfterOpen; + bool m_bWasNull; + bool m_bEOF; + bool m_bOnFirstAfterOpen; - sal_Int32 getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - sal_Int32 getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException); + static sal_Int32 getResultSetConcurrency() throw(css::sdbc::SQLException, css::uno::RuntimeException); + static sal_Int32 getResultSetType() throw(css::sdbc::SQLException, css::uno::RuntimeException); + static sal_Int32 getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - OUString getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException); + static OUString getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException); @@ -92,91 +92,91 @@ namespace connectivity protected: // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException); + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + throw (css::uno::Exception) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle - ) const; + ) const override; public: // a Constructor, that is needed for when Returning the Object is needed: ODatabaseMetaDataResultSet( ADORecordset* _pRecordSet); - ~ODatabaseMetaDataResultSet(); + ~ODatabaseMetaDataResultSet() override; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; const ::std::vector<sal_Int32>& getColumnMapping() { return m_aColMapping; } @@ -193,7 +193,7 @@ namespace connectivity void setIndexInfoMap(); void setTablePrivilegesMap(); void setCrossReferenceMap(); - void setTypeInfoMap(sal_Bool _bJetEngine); + void setTypeInfoMap(bool _bJetEngine); }; inline sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index 539592966e15..ba330c063ba1 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -72,33 +72,33 @@ namespace connectivity if(m_pRecordSet) m_pRecordSet->AddRef(); } - ~ODatabaseMetaDataResultSetMetaData(); + ~ODatabaseMetaDataResultSetMetaData() override; /// Avoid ambigous cast error from the compiler. inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index dd85d8a4d290..74ae68347787 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -53,10 +53,10 @@ namespace connectivity public: ODriver(const css::uno::Reference< css::lang::XMultiServiceFactory >& _xORB); - ~ODriver(); + ~ODriver() override; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() override; // XInterface static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); @@ -66,20 +66,20 @@ namespace connectivity void impl_checkURL_throw(const OUString& _sUrl); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException); + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException) override; // XDataDefinitionSupplier - virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( const css::uno::Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx index c80e98fe10ec..fe1df7e2ef11 100644 --- a/connectivity/source/inc/ado/AGroup.hxx +++ b/connectivity/source/inc/ado/AGroup.hxx @@ -35,30 +35,30 @@ namespace connectivity WpADOGroup m_aGroup; OCatalog* m_pCatalog; - sal_Int32 MapRight(RightsEnum _eNum); - RightsEnum Map2Right(sal_Int32 _eNum); - ObjectTypeEnum MapObjectType(sal_Int32 _ObjType); + static sal_Int32 MapRight(RightsEnum _eNum); + static RightsEnum Map2Right(sal_Int32 _eNum); + static ObjectTypeEnum MapObjectType(sal_Int32 ObjType); protected: - virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception); + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue,sal_Int32 nHandle) const override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override; public: - virtual void refreshUsers(); + virtual void refreshUsers() override; public: - OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, ADOGroup* _pGroup=NULL); - OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name); + OAdoGroup(OCatalog* _pParent,bool _bCase, ADOGroup* _pGroup=nullptr); + OAdoGroup(OCatalog* _pParent,bool _bCase, const OUString& Name); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; WpADOGroup getImpl() const { return m_aGroup; } }; diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index b027392063e3..3a5543f63c77 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.hxx @@ -34,16 +34,16 @@ namespace connectivity OCatalog* m_pCatalog; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OGroups(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - const WpADOGroups& _rCollection,sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) + const WpADOGroups& _rCollection,bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) { diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx index e93b49b3f50d..c8060b1a506e 100644 --- a/connectivity/source/inc/ado/AIndex.hxx +++ b/connectivity/source/inc/ado/AIndex.hxx @@ -35,16 +35,16 @@ namespace connectivity OConnection* m_pConnection; protected: void fillPropertyValues(); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override; public: - virtual void refreshColumns(); + virtual void refreshColumns() override; public: - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - OAdoIndex(sal_Bool _bCase, OConnection* _pConnection,ADOIndex* _pIndex); - OAdoIndex(sal_Bool _bCase, OConnection* _pConnection); + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; + OAdoIndex(bool _bCase, OConnection* _pConnection,ADOIndex* _pIndex); + OAdoIndex(bool _bCase, OConnection* _pConnection); // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); WpADOIndex getImpl() const { return m_aIndex;} diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx index e79fe073b0fa..b5cc353322e5 100644 --- a/connectivity/source/inc/ado/AIndexes.hxx +++ b/connectivity/source/inc/ado/AIndexes.hxx @@ -33,17 +33,17 @@ namespace connectivity WpADOIndexes m_aCollection; OConnection* m_pConnection; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OIndexes(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const WpADOIndexes& _rCollection, - sal_Bool _bCase, + bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) , m_aCollection(_rCollection) diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx index 13cd82878711..c44a9aa9f5ca 100644 --- a/connectivity/source/inc/ado/AKey.hxx +++ b/connectivity/source/inc/ado/AKey.hxx @@ -37,27 +37,27 @@ namespace connectivity OConnection* m_pConnection; protected: void fillPropertyValues(); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override; public: - virtual void refreshColumns(); + virtual void refreshColumns() override; public: - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); - OAdoKey(sal_Bool _bCase,OConnection* _pConnection,ADOKey* _pKey); - OAdoKey(sal_Bool _bCase,OConnection* _pConnection); + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; + OAdoKey(bool _bCase,OConnection* _pConnection,ADOKey* _pKey); + OAdoKey(bool _bCase,OConnection* _pConnection); // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); WpADOKey getImpl() const { return m_aKey;} // map the update/delete rules - static RuleEnum Map2Rule(const sal_Int32& _eNum); + static RuleEnum Map2Rule(sal_Int32 _eNum); static sal_Int32 MapRule(const RuleEnum& _eNum); // map the keytypes static sal_Int32 MapKeyRule(const KeyTypeEnum& _eNum); - static KeyTypeEnum Map2KeyRule(const sal_Int32& _eNum); + static KeyTypeEnum Map2KeyRule(sal_Int32 _eNum); }; } } diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx index 0a9762832d32..15359bb0293a 100644 --- a/connectivity/source/inc/ado/AKeys.hxx +++ b/connectivity/source/inc/ado/AKeys.hxx @@ -34,17 +34,17 @@ namespace connectivity OConnection* m_pConnection; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OKeys(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const WpADOKeys& _rCollection, - sal_Bool _bCase, + bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pConnection(_pConnection) diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index 166bc5b16a5e..971faa6ad977 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -43,7 +43,7 @@ namespace connectivity public css::lang::XServiceInfo { - void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType,const sal_Int32& _nSize,const OLEVariant& _Val) + void setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, sal_Int32 _nSize,const OLEVariant& Val) throw(css::sdbc::SQLException, css::uno::RuntimeException); void replaceParameterNodeName( OSQLParseNode* _pNode, const OUString& _sDefaultName, @@ -56,12 +56,12 @@ namespace connectivity const OTypeInfoMap& m_aTypeInfo; ADOParameters* m_pParameters; - virtual ~OPreparedStatement(); + virtual ~OPreparedStatement() override; public: DECLARE_SERVICE_INFO(); // a Constructor, that is needed for when Returning the Object is needed: - OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql); + OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& TypeInfo,const OUString& sql); virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 91c74652fc87..a8b1ae9e8564 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -70,14 +70,14 @@ namespace connectivity ::std::vector<OLEVariant> m_aBookmarks; OLEVariant m_aValue; ADO_LONGPTR m_nRowPos; - sal_Bool m_bEOF; - sal_Bool m_bOnFirstAfterOpen; + bool m_bEOF; + bool m_bOnFirstAfterOpen; sal_Int32 getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException); + static sal_Int32 getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - OUString getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException); + static OUString getCursorName() throw(css::sdbc::SQLException, css::uno::RuntimeException); void setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException); void setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException); @@ -87,25 +87,25 @@ namespace connectivity protected: // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException); + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + throw (css::uno::Exception) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle - ) const; - virtual ~OResultSet(); + ) const override; + virtual ~OResultSet() override; public: // a Constructor, that is needed for when Returning the Object is needed: OResultSet( ADORecordset* _pRecordSet,OStatement_Base* pStmt); @@ -115,105 +115,105 @@ namespace connectivity void construct(); inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException) override; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException); + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException); + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx index 317ab07f4edb..b2268720e9d2 100644 --- a/connectivity/source/inc/ado/AResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx @@ -50,32 +50,32 @@ namespace connectivity OResultSetMetaData& operator=( const OResultSetMetaData& ); // never implemented protected: - virtual ~OResultSetMetaData(); + virtual ~OResultSetMetaData() override; public: // a Constructor, that is needed for when Returning the Object is needed: OResultSetMetaData( ADORecordset* _pRecordSet); - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; }; } } diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index a2fe5df6d3f8..976af476a000 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -84,11 +84,11 @@ namespace connectivity private: sal_Int32 getQueryTimeOut() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - sal_Int32 getMaxFieldSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException); + static sal_Int32 getMaxFieldSize() throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getMaxRows() const throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException); - sal_Int32 getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException); + static sal_Int32 getFetchDirection() throw(css::sdbc::SQLException, css::uno::RuntimeException); sal_Int32 getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException); OUString getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException); @@ -173,7 +173,7 @@ namespace connectivity public: // a Constructor, that is needed for when Returning the Object is needed: OStatement( OConnection* _pConnection) : OStatement_Base( _pConnection){}; - ~OStatement(); + ~OStatement() override; DECLARE_SERVICE_INFO(); diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index 41bb57a9eb05..ca7882686695 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -38,38 +38,38 @@ namespace connectivity protected: void fillPropertyValues(); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception); + virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue)throw (css::uno::Exception) override; public: - virtual void refreshColumns(); - virtual void refreshKeys(); - virtual void refreshIndexes(); + virtual void refreshColumns() override; + virtual void refreshKeys() override; + virtual void refreshIndexes() override; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() override; public: - OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable); - OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); + OAdoTable(sdbcx::OCollection* _pTables,bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable); + OAdoTable(sdbcx::OCollection* _pTables,bool _bCase,OCatalog* _pCatalog); - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException) override; OUString getSchema() const { return m_SchemaName; } - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const override; // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XRename - virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException) override; // XAlterTable - virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException); - virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::container::NoSuchElementException, css::uno::RuntimeException) override; + virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - sal_Bool create() throw(css::sdbc::SQLException, css::uno::RuntimeException); + bool create() throw(css::sdbc::SQLException, css::uno::RuntimeException); WpADOTable getImpl() const { return m_aTable;} OCatalog* getCatalog() const { return m_pCatalog; } diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx index d28c871ec0ec..7fa12b09d3f4 100644 --- a/connectivity/source/inc/ado/ATables.hxx +++ b/connectivity/source/inc/ado/ATables.hxx @@ -33,17 +33,17 @@ namespace connectivity WpADOTables m_aCollection; OCatalog* m_pCatalog; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; void setComments(const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OTables(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const WpADOTables& _rCollection, - sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) + bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) { diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx index c41baa1b8d55..3bd925584f9a 100644 --- a/connectivity/source/inc/ado/AUser.hxx +++ b/connectivity/source/inc/ado/AUser.hxx @@ -41,30 +41,30 @@ namespace connectivity sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + throw (css::uno::Exception) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle - ) const; + ) const override; public: - virtual void refreshGroups(); + virtual void refreshGroups() override; public: - OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser=NULL); - OAdoUser(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name); + OAdoUser(OCatalog* _pParent,bool _bCase, ADOUser* _pUser=nullptr); + OAdoUser(OCatalog* _pParent,bool _bCase, const OUString& Name); // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XUser - virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; // XAuthorizable - virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; WpADOUser getImpl() const { return m_aUser;} }; @@ -78,14 +78,14 @@ namespace connectivity protected: OUString m_Password; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; public: - OUserExtend(OCatalog* _pParent,sal_Bool _bCase,ADOUser* _pUser=NULL); - OUserExtend(OCatalog* _pParent,sal_Bool _bCase,const OUString& _Name); + OUserExtend(OCatalog* _pParent,bool _bCase,ADOUser* _pUser=nullptr); + OUserExtend(OCatalog* _pParent,bool _bCase,const OUString& Name); - virtual void construct(); + virtual void construct() override; OUString getPassword() const { return m_Password;} }; } diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx index 7a1ca0056a86..351d25242327 100644 --- a/connectivity/source/inc/ado/AUsers.hxx +++ b/connectivity/source/inc/ado/AUsers.hxx @@ -34,17 +34,17 @@ namespace connectivity WpADOUsers m_aCollection; OCatalog* m_pCatalog; public: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OUsers( OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const WpADOUsers& _rCollection, - sal_Bool _bCase) + bool _bCase) :sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx index 7678acc169d2..f6c24247e22c 100644 --- a/connectivity/source/inc/ado/AView.hxx +++ b/connectivity/source/inc/ado/AView.hxx @@ -39,15 +39,15 @@ namespace connectivity virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle - ) const; + ) const override; public: - OAdoView(sal_Bool _bCase, ADOView* _pView=NULL); + OAdoView(bool _bCase, ADOView* _pView=nullptr); // css::lang::XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException) override; static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; WpADOView getImpl() const { return m_aView;} }; diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx index df936b577745..13d9c0135c10 100644 --- a/connectivity/source/inc/ado/AViews.hxx +++ b/connectivity/source/inc/ado/AViews.hxx @@ -35,16 +35,16 @@ namespace connectivity WpADOViews m_aCollection; OCatalog* m_pCatalog; protected: - virtual sdbcx::ObjectType createObject(const OUString& _rName); - virtual void impl_refresh() throw(css::uno::RuntimeException); - virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor(); - virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ); + virtual sdbcx::ObjectType createObject(const OUString& _rName) override; + virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySet > createDescriptor() override; + virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override; void setComments(const css::uno::Reference< css::beans::XPropertySet >& descriptor ) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName); + virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OViews(OCatalog* _pParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, - WpADOViews& _rCollection,sal_Bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) + WpADOViews& _rCollection,bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) { diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index 82d6fabb2efa..320ef9706f54 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -88,7 +88,7 @@ namespace connectivity OLEVariant(const css::util::Date& x ); OLEVariant(const css::util::Time& x ); OLEVariant(const css::util::DateTime& x ); - OLEVariant(const float &x); + OLEVariant(float x); OLEVariant(const double &x); OLEVariant(IDispatch* pDispInterface); OLEVariant(const css::uno::Sequence< sal_Int8 >& x); @@ -107,7 +107,7 @@ namespace connectivity void setDate(DATE d) ; void setChar(unsigned char a) ; void setCurrency(double aCur) ; - void setBool(sal_Bool b) ; + void setBool(bool b) ; void setString(const OUString& us) ; void setNoArg() ; @@ -117,14 +117,14 @@ namespace connectivity void setUI1SAFEARRAYPtr(SAFEARRAY* pSafeAr); void setArray(SAFEARRAY* pSafeArray, VARTYPE vtType); - sal_Bool isNull() const ; - sal_Bool isEmpty() const ; + bool isNull() const ; + bool isEmpty() const ; VARTYPE getType() const ; void ChangeType(VARTYPE vartype, const OLEVariant* pSrc); OUString getString() const; - sal_Bool getBool() const; + bool getBool() const; IUnknown* getIUnknown() const; IDispatch* getIDispatch() const; sal_uInt8 getByte() const; @@ -143,7 +143,7 @@ namespace connectivity SAFEARRAY* getUI1SAFEARRAYPtr() const; css::uno::Any makeAny() const; - static VARIANT_BOOL VariantBool(sal_Bool bEinBoolean); + static VARIANT_BOOL VariantBool(bool bEinBoolean); private: void CHS(); diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 7f2b75153ec0..c5f8ee10a8fc 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -51,7 +51,7 @@ namespace connectivity void clear(); - sal_Bool IsValid() const; + bool IsValid() const; operator IDispatch*(); }; @@ -74,7 +74,7 @@ namespace connectivity T* pInterface; public: - WpOLEBase(T* pInt = NULL) : WpBase(pInt),pInterface(pInt){} + WpOLEBase(T* pInt = nullptr) : WpBase(pInt),pInterface(pInt){} //inline @@ -98,7 +98,7 @@ namespace connectivity { } - virtual ~WpOLEBase() + virtual ~WpOLEBase() override { } @@ -132,7 +132,7 @@ namespace connectivity using WpOLEBase<Ts>::IsValid; // Ctors, operator= // They only call the superclass - WpOLECollection(Ts* pInt=NULL):WpOLEBase<Ts>(pInt){} + WpOLECollection(Ts* pInt=nullptr):WpOLEBase<Ts>(pInt){} WpOLECollection(const WpOLECollection& rhs) : WpOLEBase<Ts>(rhs) {} inline WpOLECollection& operator=(const WpOLECollection& rhs) {WpOLEBase<Ts>::operator=(rhs); return *this;}; @@ -206,18 +206,18 @@ namespace connectivity // Ctors, operator= // They only call the superclass using WpOLEBase<Ts>::pInterface; - WpOLEAppendCollection(Ts* pInt=NULL):WpOLECollection<Ts,T,WrapT>(pInt){} + WpOLEAppendCollection(Ts* pInt=nullptr):WpOLECollection<Ts,T,WrapT>(pInt){} WpOLEAppendCollection(const WpOLEAppendCollection& rhs) : WpOLECollection<Ts, T, WrapT>(rhs) {} inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) {WpOLEBase<Ts>::operator=(rhs); return *this;}; - inline sal_Bool Append(const WrapT& aWrapT) + inline bool Append(const WrapT& aWrapT) { - return SUCCEEDED(pInterface->Append(OLEVariant((T*)aWrapT))); + return SUCCEEDED(pInterface->Append(OLEVariant(static_cast<T*>(aWrapT)))); }; - inline sal_Bool Delete(const OUString& sName) + inline bool Delete(const OUString& sName) { return SUCCEEDED(pInterface->Delete(OLEVariant(sName))); }; diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx index 1638ea79deff..cdfe15dd98dc 100644 --- a/connectivity/source/inc/ado/Awrapado.hxx +++ b/connectivity/source/inc/ado/Awrapado.hxx @@ -63,41 +63,41 @@ namespace connectivity WpADOProperties get_Properties() const; OUString GetConnectionString() const; - sal_Bool PutConnectionString(const OUString &aCon) const; + bool PutConnectionString(const OUString &aCon) const; sal_Int32 GetCommandTimeout() const; void PutCommandTimeout(sal_Int32 nRet); sal_Int32 GetConnectionTimeout() const ; void PutConnectionTimeout(sal_Int32 nRet); - sal_Bool Close( ) ; - sal_Bool Execute(const OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset); - sal_Bool BeginTrans(); - sal_Bool CommitTrans( ) ; - sal_Bool RollbackTrans( ); - sal_Bool Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options); - sal_Bool GetErrors(ADOErrors** pErrors); + bool Close( ) ; + bool Execute(const OUString& CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset); + bool BeginTrans(); + bool CommitTrans( ) ; + bool RollbackTrans( ); + bool Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options); + bool GetErrors(ADOErrors** pErrors); OUString GetDefaultDatabase() const; - sal_Bool PutDefaultDatabase(const OUString& _bstr); + bool PutDefaultDatabase(const OUString& _bstr); IsolationLevelEnum get_IsolationLevel() const ; - sal_Bool put_IsolationLevel(const IsolationLevelEnum& eNum) ; + bool put_IsolationLevel(const IsolationLevelEnum& eNum) ; sal_Int32 get_Attributes() const; - sal_Bool put_Attributes(sal_Int32 nRet); + bool put_Attributes(sal_Int32 nRet); CursorLocationEnum get_CursorLocation() const; - sal_Bool put_CursorLocation(const CursorLocationEnum &eNum) ; + bool put_CursorLocation(const CursorLocationEnum &eNum) ; ConnectModeEnum get_Mode() const; - sal_Bool put_Mode(const ConnectModeEnum &eNum) ; + bool put_Mode(const ConnectModeEnum &eNum) ; OUString get_Provider() const; - sal_Bool put_Provider(const OUString& _bstr); + bool put_Provider(const OUString& _bstr); sal_Int32 get_State() const; - sal_Bool OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OLEVariant& SchemaID,ADORecordset**pprset); + bool OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OLEVariant& SchemaID,ADORecordset**pprset); OUString get_Version() const; @@ -105,7 +105,7 @@ namespace connectivity ADORecordset* getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ); ADORecordset* getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ); ADORecordset* getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ); - ADORecordset* getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ); + ADORecordset* getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, bool unique, bool approximate ); ADORecordset* getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ); @@ -153,27 +153,27 @@ namespace connectivity WpOLEBase<ADOCommand>::operator=(rhs); return *this;} - sal_Bool putref_ActiveConnection( WpADOConnection *pCon); + bool putref_ActiveConnection( WpADOConnection *pCon); void put_ActiveConnection(/* [in] */ const OLEVariant& vConn); void Create(); sal_Int32 get_State() const; OUString get_CommandText() const; - sal_Bool put_CommandText(const OUString &aCon) ; + bool put_CommandText(const OUString &aCon) ; sal_Int32 get_CommandTimeout() const; void put_CommandTimeout(sal_Int32 nRet); - sal_Bool get_Prepared() const; - sal_Bool put_Prepared(VARIANT_BOOL bPrepared) const; - sal_Bool Execute(OLEVariant& RecordsAffected,OLEVariant& Parameters,long Options, ADORecordset** ppiRset); + bool get_Prepared() const; + bool put_Prepared(VARIANT_BOOL bPrepared) const; + bool Execute(OLEVariant& RecordsAffected,OLEVariant& Parameters,long Options, ADORecordset** ppiRset); ADOParameter* CreateParameter(const OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value); ADOParameters* get_Parameters() const; - sal_Bool put_CommandType( /* [in] */ CommandTypeEnum lCmdType); + bool put_CommandType( /* [in] */ CommandTypeEnum lCmdType); CommandTypeEnum get_CommandType( ) const ; // Returns the field's name OUString GetName() const ; - sal_Bool put_Name(const OUString& _Name); - sal_Bool Cancel(); + bool put_Name(const OUString& Name); + bool Cancel(); }; class WpADOError : public WpOLEBase<ADOError> @@ -205,7 +205,7 @@ namespace connectivity // Ctors, operator= // They only call the superclass - WpADOField(ADOField* pInt=NULL):WpOLEBase<ADOField>(pInt){} + WpADOField(ADOField* pInt=nullptr):WpOLEBase<ADOField>(pInt){} WpADOField(const WpADOField& rhs) : WpOLEBase<ADOField>(rhs) {} WpADOField& operator=(const WpADOField& rhs) @@ -222,10 +222,10 @@ namespace connectivity DataTypeEnum GetADOType() const ; void get_Value(OLEVariant& aValVar) const ; OLEVariant get_Value() const; - sal_Bool PutValue(const OLEVariant& aVariant); + bool PutValue(const OLEVariant& aVariant); sal_Int32 GetPrecision() const ; sal_Int32 GetNumericScale() const ; - sal_Bool AppendChunk(const OLEVariant& _Variant); + bool AppendChunk(const OLEVariant& Variant); OLEVariant GetChunk(long Length) const; void GetChunk(long Length,OLEVariant &aValVar) const; OLEVariant GetOriginalValue() const; @@ -234,15 +234,15 @@ namespace connectivity void GetUnderlyingValue(OLEVariant &aValVar) const; - sal_Bool PutPrecision(sal_Int8 _prec); + bool PutPrecision(sal_Int8 _prec); - sal_Bool PutNumericScale(sal_Int8 _prec); + bool PutNumericScale(sal_Int8 _prec); void PutADOType(DataTypeEnum eType) ; - sal_Bool PutDefinedSize(sal_Int32 _nDefSize); + bool PutDefinedSize(sal_Int32 _nDefSize); - sal_Bool PutAttributes(sal_Int32 _nDefSize); + bool PutAttributes(sal_Int32 _nDefSize); }; @@ -251,7 +251,7 @@ namespace connectivity public: // Ctors, operator= // They only call the superclass - WpADOProperty(ADOProperty* pInt=NULL):WpOLEBase<ADOProperty>(pInt){} + WpADOProperty(ADOProperty* pInt=nullptr):WpOLEBase<ADOProperty>(pInt){} WpADOProperty(const WpADOProperty& rhs) : WpOLEBase<ADOProperty>(rhs) {} WpADOProperty& operator=(const WpADOProperty& rhs) {WpOLEBase<ADOProperty>::operator=(rhs); return *this;} @@ -259,11 +259,11 @@ namespace connectivity OLEVariant GetValue() const; void GetValue(OLEVariant &aValVar) const; - sal_Bool PutValue(const OLEVariant &aValVar) ; + bool PutValue(const OLEVariant &aValVar) ; OUString GetName() const ; DataTypeEnum GetADOType() const ; sal_Int32 GetAttributes() const ; - sal_Bool PutAttributes(sal_Int32 _nDefSize); + bool PutAttributes(sal_Int32 _nDefSize); }; @@ -273,21 +273,21 @@ namespace connectivity public: // Ctors, operator= // They only call the superclass - WpADORecordset(ADORecordset* pInt=NULL):WpOLEBase<ADORecordset>(pInt){} + WpADORecordset(ADORecordset* pInt=nullptr):WpOLEBase<ADORecordset>(pInt){} WpADORecordset(const WpADORecordset& rhs) : WpOLEBase<ADORecordset>() {operator=(rhs);} WpADORecordset& operator=(const WpADORecordset& rhs) { WpOLEBase<ADORecordset>::operator=(rhs); return *this; } - ~WpADORecordset() + ~WpADORecordset() override { // if(pInterface && get_State() == adStateOpen) // Close(); } void Create(); - sal_Bool Open( + bool Open( /* [optional][in] */ VARIANT Source, /* [optional][in] */ VARIANT ActiveConnection, /* [defaultvalue][in] */ CursorTypeEnum CursorType, @@ -295,41 +295,41 @@ namespace connectivity /* [defaultvalue][in] */ sal_Int32 Options); LockTypeEnum GetLockType(); void Close(); - sal_Bool Cancel() const; + bool Cancel() const; sal_Int32 get_State( ); - sal_Bool Supports( /* [in] */ CursorOptionEnum CursorOptions); + bool Supports( /* [in] */ CursorOptionEnum CursorOptions); PositionEnum_Param get_AbsolutePosition(); void GetDataSource(IUnknown** pIUnknown) const ; void PutRefDataSource(IUnknown* pIUnknown); void GetBookmark(VARIANT& var); OLEVariant GetBookmark(); CompareEnum CompareBookmarks(const OLEVariant& left,const OLEVariant& right); - sal_Bool SetBookmark(const OLEVariant &pSafeAr); + bool SetBookmark(const OLEVariant &pSafeAr); WpADOFields GetFields() const; - sal_Bool Move(sal_Int32 nRows, VARIANT aBmk); - sal_Bool MoveNext(); - sal_Bool MovePrevious(); - sal_Bool MoveFirst(); - sal_Bool MoveLast(); - - sal_Bool IsAtBOF() const; - sal_Bool IsAtEOF() const; - sal_Bool Delete(AffectEnum eNum); - sal_Bool AddNew(const OLEVariant &FieldList,const OLEVariant &Values); - sal_Bool Update(const OLEVariant &FieldList,const OLEVariant &Values); - sal_Bool CancelUpdate(); + bool Move(sal_Int32 nRows, VARIANT aBmk); + bool MoveNext(); + bool MovePrevious(); + bool MoveFirst(); + bool MoveLast(); + + bool IsAtBOF() const; + bool IsAtEOF() const; + bool Delete(AffectEnum eNum); + bool AddNew(const OLEVariant &FieldList,const OLEVariant &Values); + bool Update(const OLEVariant &FieldList,const OLEVariant &Values); + bool CancelUpdate(); WpADOProperties get_Properties() const; - sal_Bool NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset); - sal_Bool get_RecordCount(ADO_LONGPTR &_nRet) const; - sal_Bool get_MaxRecords(ADO_LONGPTR &_nRet) const; - sal_Bool put_MaxRecords(ADO_LONGPTR _nRet); - sal_Bool get_CursorType(CursorTypeEnum &_nRet) const; - sal_Bool put_CursorType(CursorTypeEnum _nRet); - sal_Bool get_LockType(LockTypeEnum &_nRet) const; - sal_Bool put_LockType(LockTypeEnum _nRet); - sal_Bool get_CacheSize(sal_Int32 &_nRet) const; - sal_Bool put_CacheSize(sal_Int32 _nRet); - sal_Bool UpdateBatch(AffectEnum AffectRecords); + bool NextRecordset(OLEVariant& RecordsAffected,ADORecordset** ppiRset); + bool get_RecordCount(ADO_LONGPTR &_nRet) const; + bool get_MaxRecords(ADO_LONGPTR &_nRet) const; + bool put_MaxRecords(ADO_LONGPTR _nRet); + bool get_CursorType(CursorTypeEnum &_nRet) const; + bool put_CursorType(CursorTypeEnum _nRet); + bool get_LockType(LockTypeEnum &_nRet) const; + bool put_LockType(LockTypeEnum _nRet); + bool get_CacheSize(sal_Int32 &_nRet) const; + bool put_CacheSize(sal_Int32 _nRet); + bool UpdateBatch(AffectEnum AffectRecords); }; @@ -347,15 +347,15 @@ namespace connectivity OUString GetName() const ; DataTypeEnum GetADOType() const ; void put_Type(const DataTypeEnum& _eType); - sal_Bool put_Size(const sal_Int32& _nSize); + bool put_Size(sal_Int32 _nSize); sal_Int32 GetAttributes() const ; sal_Int32 GetPrecision() const ; sal_Int32 GetNumericScale() const ; ParameterDirectionEnum get_Direction() const; void GetValue(OLEVariant& aValVar) const ; OLEVariant GetValue() const; - sal_Bool PutValue(const OLEVariant& aVariant); - sal_Bool AppendChunk(const OLEVariant& aVariant); + bool PutValue(const OLEVariant& aVariant); + bool AppendChunk(const OLEVariant& aVariant); }; class OTools diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx index 4e6977001a66..9e233ae1f834 100644 --- a/connectivity/source/inc/ado/Awrapadox.hxx +++ b/connectivity/source/inc/ado/Awrapadox.hxx @@ -76,7 +76,7 @@ namespace connectivity class WpADOView : public WpOLEBase<ADOView> { public: - WpADOView(ADOView* pInt=NULL) : WpOLEBase<ADOView>(pInt){} + WpADOView(ADOView* pInt=nullptr) : WpOLEBase<ADOView>(pInt){} WpADOView(const WpADOView& rhs) : WpOLEBase<ADOView>(rhs) {} inline WpADOView& operator=(const WpADOView& rhs) @@ -90,7 +90,7 @@ namespace connectivity class WpADOGroup : public WpOLEBase<ADOGroup> { public: - WpADOGroup(ADOGroup* pInt=NULL) : WpOLEBase<ADOGroup>(pInt){} + WpADOGroup(ADOGroup* pInt=nullptr) : WpOLEBase<ADOGroup>(pInt){} WpADOGroup(const WpADOGroup& rhs) : WpOLEBase<ADOGroup>(rhs) {} inline WpADOGroup& operator=(const WpADOGroup& rhs) @@ -103,7 +103,7 @@ namespace connectivity RightsEnum GetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType); - sal_Bool SetPermissions( + bool SetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType, /* [in] */ ActionEnum Action, @@ -114,7 +114,7 @@ namespace connectivity class WpADOUser : public WpOLEBase<_ADOUser> { public: - WpADOUser(_ADOUser* pInt=NULL) : WpOLEBase<_ADOUser>(pInt){} + WpADOUser(_ADOUser* pInt=nullptr) : WpOLEBase<_ADOUser>(pInt){} WpADOUser(const WpADOUser& rhs) : WpOLEBase<_ADOUser>(rhs) {} inline WpADOUser& operator=(const WpADOUser& rhs) @@ -124,12 +124,12 @@ namespace connectivity OUString get_Name() const; void put_Name(const OUString& _rName); - sal_Bool ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd); + bool ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd); WpADOGroups get_Groups(); RightsEnum GetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType); - sal_Bool SetPermissions( + bool SetPermissions( /* [in] */ const OLEVariant& Name, /* [in] */ ObjectTypeEnum ObjectType, /* [in] */ ActionEnum Action, diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx index 2f82fee29c5e..ae67f5dbbd67 100644 --- a/connectivity/source/inc/ado/WrapCatalog.hxx +++ b/connectivity/source/inc/ado/WrapCatalog.hxx @@ -28,7 +28,7 @@ namespace connectivity class WpADOCatalog : public WpOLEBase<_ADOCatalog> { public: - WpADOCatalog(_ADOCatalog* pInt = NULL) : WpOLEBase<_ADOCatalog>(pInt){} + WpADOCatalog(_ADOCatalog* pInt = nullptr) : WpOLEBase<_ADOCatalog>(pInt){} WpADOCatalog(const WpADOCatalog& rhs) : WpOLEBase<_ADOCatalog>(rhs) {} inline WpADOCatalog& operator=(const WpADOCatalog& rhs) diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx index 4e19b1004d8c..c6d47aa98151 100644 --- a/connectivity/source/inc/ado/WrapColumn.hxx +++ b/connectivity/source/inc/ado/WrapColumn.hxx @@ -32,7 +32,7 @@ namespace connectivity class WpADOColumn : public WpOLEBase<_ADOColumn> { public: - WpADOColumn(_ADOColumn* pInt=NULL) : WpOLEBase<_ADOColumn>(pInt){} + WpADOColumn(_ADOColumn* pInt=nullptr) : WpOLEBase<_ADOColumn>(pInt){} WpADOColumn(const WpADOColumn& rhs) : WpOLEBase<_ADOColumn>(rhs) {} void Create(); @@ -54,7 +54,7 @@ namespace connectivity void put_SortOrder(SortOrderEnum _nScale); sal_Int32 get_DefinedSize() const; ColumnAttributesEnum get_Attributes() const; - sal_Bool put_Attributes(const ColumnAttributesEnum& _eNum); + bool put_Attributes(const ColumnAttributesEnum& _eNum); WpADOProperties get_Properties() const; void put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject); }; diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx index 8e0483e933a0..bfffdfded043 100644 --- a/connectivity/source/inc/ado/WrapIndex.hxx +++ b/connectivity/source/inc/ado/WrapIndex.hxx @@ -28,7 +28,7 @@ namespace connectivity class WpADOIndex : public WpOLEBase<_ADOIndex> { public: - WpADOIndex(_ADOIndex* pInt=NULL) : WpOLEBase<_ADOIndex>(pInt){} + WpADOIndex(_ADOIndex* pInt=nullptr) : WpOLEBase<_ADOIndex>(pInt){} WpADOIndex(const WpADOIndex& rhs) : WpOLEBase<_ADOIndex>(rhs) {} inline WpADOIndex& operator=(const WpADOIndex& rhs) @@ -38,12 +38,12 @@ namespace connectivity OUString get_Name() const; void put_Name(const OUString& _rName); - sal_Bool get_Clustered() const; - void put_Clustered(sal_Bool _b); - sal_Bool get_Unique() const; - void put_Unique(sal_Bool _b); - sal_Bool get_PrimaryKey() const; - void put_PrimaryKey(sal_Bool _b); + bool get_Clustered() const; + void put_Clustered(bool _b); + bool get_Unique() const; + void put_Unique(bool _b); + bool get_PrimaryKey() const; + void put_PrimaryKey(bool _b); WpADOColumns get_Columns() const; }; } diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx index 61b90569b53c..b8ab562a2ac1 100644 --- a/connectivity/source/inc/ado/WrapKey.hxx +++ b/connectivity/source/inc/ado/WrapKey.hxx @@ -28,7 +28,7 @@ namespace connectivity class WpADOKey : public WpOLEBase<ADOKey> { public: - WpADOKey(ADOKey* pInt=NULL) : WpOLEBase<ADOKey>(pInt){} + WpADOKey(ADOKey* pInt=nullptr) : WpOLEBase<ADOKey>(pInt){} WpADOKey(const WpADOKey& rhs) : WpOLEBase<ADOKey>(rhs) {} inline WpADOKey& operator=(const WpADOKey& rhs) diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx index fa3aa147167f..e99eb33be714 100644 --- a/connectivity/source/inc/ado/WrapTable.hxx +++ b/connectivity/source/inc/ado/WrapTable.hxx @@ -30,7 +30,7 @@ namespace connectivity class WpADOTable : public WpOLEBase<_ADOTable> { public: - WpADOTable(_ADOTable* pInt=NULL) : WpOLEBase<_ADOTable>(pInt){} + WpADOTable(_ADOTable* pInt=nullptr) : WpOLEBase<_ADOTable>(pInt){} WpADOTable(const WpADOTable& rhs) : WpOLEBase<_ADOTable>(rhs) {} inline WpADOTable& operator=(const WpADOTable& rhs) diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx index bf3a1cade121..c360455086b0 100644 --- a/connectivity/source/inc/ado/adoimp.hxx +++ b/connectivity/source/inc/ado/adoimp.hxx @@ -75,7 +75,7 @@ namespace connectivity static void ThrowException(ADOConnection* _pAdoCon,const css::uno::Reference< css::uno::XInterface >& _xInterface) throw(css::sdbc::SQLException, css::uno::RuntimeException); static sal_Int32 MapADOType2Jdbc(DataTypeEnum eType); static DataTypeEnum MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine); - static sal_Bool isJetEngine(sal_Int32 _nEngineType); + static bool isJetEngine(sal_Int32 _nEngineType); static ObjectTypeEnum mapObjectType2Ado(sal_Int32 objType); static sal_Int32 mapAdoType2Object(ObjectTypeEnum objType); |