diff options
Diffstat (limited to 'connectivity')
159 files changed, 253 insertions, 1159 deletions
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 146c6afeeb2b..9c2e6450a2f9 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -32,7 +32,7 @@ endif # In mergedlibs mode we have multiply-defined symbols, which Visual Studio # does not like. There is no good solution, so just force it. ifeq ($(COM),MSC) -ifeq ($(MERGELIBS),CORE) +ifneq (,$(MERGELIBS)) $(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ /FORCE:MULTIPLE \ )) diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 7170dc008e49..57127b74e80c 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/d $(eval $(call gb_Library_set_include,dbtools,\ $$(INCLUDE) \ + -I$(SRCDIR)/connectivity/inc \ -I$(SRCDIR)/connectivity/source/inc \ )) @@ -126,11 +127,6 @@ $(eval $(call gb_Library_add_exception_objects,dbtools,\ connectivity/source/sdbcx/VTable \ connectivity/source/sdbcx/VUser \ connectivity/source/sdbcx/VView \ - connectivity/source/simpledbt/charset_s \ - connectivity/source/simpledbt/dbtfactory \ - connectivity/source/simpledbt/parsenode_s \ - connectivity/source/simpledbt/parser_s \ - connectivity/source/simpledbt/staticdbtools_s \ )) # vim: set noet sw=4 ts=4: diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 04ddc3508ac0..21554757602a 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -119,7 +119,7 @@ void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType) } } -void ODatabaseMetaDataResultSet::disposing(void) +void ODatabaseMetaDataResultSet::disposing() { OPropertySetHelper::disposing(); @@ -511,7 +511,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, Run ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper() { - return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } void ODatabaseMetaDataResultSet::setProceduresMap() diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index cd15132120b6..81550e121f5e 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx @@ -147,7 +147,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isNullable(); - return sal_False; + return sal_Int32(false); } sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 6c2ee2fa82ae..93648c1a409d 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -885,6 +885,9 @@ Any ORowSetValue::makeAny() const { switch(getTypeKind()) { + case DataType::SQLNULL: + assert(rValue == Any()); + break; case DataType::CHAR: case DataType::VARCHAR: case DataType::DECIMAL: @@ -963,8 +966,8 @@ Any ORowSetValue::makeAny() const rValue <<= m_aValue.m_uInt64; break; default: - SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): UNSPUPPORTED TYPE!"); - rValue = makeAny(); + SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): UNSUPPORTED TYPE!"); + rValue = getAny(); break; } } @@ -1234,7 +1237,7 @@ sal_uInt8 ORowSetValue::getUInt8() const break; case DataType::BIT: case DataType::BOOLEAN: - nRet = m_aValue.m_bBool; + nRet = int(m_aValue.m_bBool); break; case DataType::TINYINT: if ( m_bSigned ) diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index d52a1a0b7541..d6eb7e4c4bf9 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -107,7 +107,7 @@ const ORowSetValue& OResultSetPrivileges::getValue(sal_Int32 columnIndex) return ODatabaseMetaDataResultSet::getValue(columnIndex); } -void SAL_CALL OResultSetPrivileges::disposing(void) +void SAL_CALL OResultSetPrivileges::disposing() { ODatabaseMetaDataResultSet::disposing(); m_xTables.clear(); diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 0d0e97a40d10..454cf06e5630 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -40,7 +40,7 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v ::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin(); for (::std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i) { - const bool nGreater = (pIndex->getAscending(i) == SQL_ASC) ? false : true; + const bool nGreater = pIndex->getAscending(i) != SQL_ASC; const bool nLess = !nGreater; // compare depending for type diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 4f5e3950a573..adbb61fb4358 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -179,7 +179,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, { // generate a new format if necessary Reference< XNumberFormats > xFormats(_xTypes, UNO_QUERY); - OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, sal_True); + OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, 1); // and add it to the formatter if necessary nFormat = xFormats->queryKey(sNewFormat, _rLocale, sal_False); diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 991baf2618bc..0104e7ff04fa 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -107,7 +107,7 @@ namespace dbtools } - void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const + void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) { if ( !io_appendTo.isEmpty() ) { diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index ab827185fb2f..29b7a04cb106 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -42,7 +42,7 @@ namespace connectivity { protected: // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ~OConnectionWeakWrapper(); public: OConnectionWeakWrapper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >& _xConnection); diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 8639743f3b55..df677dc6de5e 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -326,7 +326,7 @@ Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString } Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, - const OUString& _rPath) const + const OUString& _rPath) { OSL_ASSERT(_rxConfProvider.is()); Sequence< Any > args(1); @@ -344,7 +344,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu return xInterface; } -Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw() +Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) throw() { Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY); Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY); diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index a8c55c0b17d6..22521c977559 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -86,10 +86,10 @@ namespace connectivity // some configuration helper methods ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot(); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, - const OUString& _rPath) const; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) const throw(); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider, + const OUString& _rPath); + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) throw(); bool isPoolingEnabled(); bool isDriverPoolingEnabled(const OUString& _sDriverImplName, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode); diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index 56576adde5ad..e98e2888482b 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -44,7 +44,7 @@ OPooledConnection::OPooledConnection(const Reference< XConnection >& _xConnectio } // OComponentHelper -void SAL_CALL OPooledConnection::disposing(void) +void SAL_CALL OPooledConnection::disposing() { MutexGuard aGuard(m_aMutex); if (m_xComponent.is()) diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index ee2d9f150b97..26dba7b32faf 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -43,7 +43,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory; public: // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; OPooledConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 35a6b4359da5..98450024280d 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -82,7 +82,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() m_pRecordSet->Release(); } -void ODatabaseMetaDataResultSet::disposing(void) +void ODatabaseMetaDataResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index ff0b20092e14..7e7f553c9c05 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -120,7 +120,7 @@ OResultSet::~OResultSet() m_pRecordSet->Release(); } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 662daf4d1451..a6a893a4523d 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -21,7 +21,6 @@ #include "ado/AConnection.hxx" #include "ado/AResultSet.hxx" #include <comphelper/property.hxx> -#include <comphelper/uno3.hxx> #include <osl/thread.h> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> @@ -182,8 +181,9 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) try { - Reference<XCloseable> xCloseable; - if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) ) + Reference<XCloseable> xCloseable( + m_xResultSet.get(), css::uno::UNO_QUERY); + if ( xCloseable.is() ) xCloseable->close(); } catch( const DisposedException& ) { } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index d41d462ec7ab..c3c14a1d05e4 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -67,7 +67,7 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa } -void SAL_CALL OAdoTable::disposing(void) +void SAL_CALL OAdoTable::disposing() { OTable_TYPEDEF::disposing(); m_aTable.clear(); diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index b7a4b29ef7fe..f353db13b07c 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -636,7 +636,7 @@ void OCalcTable::refreshIndexes() } -void SAL_CALL OCalcTable::disposing(void) +void SAL_CALL OCalcTable::disposing() { OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index d0c8d0205392..cb0be0944339 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -716,7 +716,7 @@ void ODbaseTable::refreshIndexes() } -void SAL_CALL ODbaseTable::disposing(void) +void SAL_CALL ODbaseTable::disposing() { OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 6f5287305609..32b808df1b2a 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -76,7 +76,7 @@ namespace connectivity void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 5c3026b261f1..f7827132a2f6 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -54,7 +54,7 @@ namespace connectivity virtual ~OEvoabDriver(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); @@ -75,7 +75,7 @@ namespace connectivity public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory(void) const { return m_xFactory; } + & getMSFactory() const { return m_xFactory; } ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 0ea33b25684b..7fc072f6c6d1 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -706,7 +706,7 @@ void OEvoabResultSet::construct( const QueryData& _rData ) } -void OEvoabResultSet::disposing(void) +void OEvoabResultSet::disposing() { ::comphelper::OPropertyContainer::disposing(); @@ -1135,7 +1135,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) thr ::cppu::IPropertyArrayHelper & OEvoabResultSet::getInfoHelper() { - return *const_cast<OEvoabResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } void SAL_CALL OEvoabResultSet::acquire() throw() diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 760f9d7db576..6c761eedb360 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -127,7 +127,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 032ec33ef058..c82418890572 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -32,6 +32,7 @@ #include "NDatabaseMetaData.hxx" #include "NResultSet.hxx" #include "resource/evoab2_res.hrc" +#include "sqlbison.hxx" #include <resource/common_res.hrc> #include <connectivity/dbexception.hxx> #include <tools/diagnose_ex.h> @@ -420,14 +421,14 @@ OUString OCommonStatement::getTableName() const OSQLParseNode *pSelectStmnt = m_aSQLIterator.getParseTree(); const OSQLParseNode *pAllTableNames = pSelectStmnt->getChild( 3 )->getChild( 0 )->getChild( 1 ); - if( m_aSQLIterator.isTableNode( pAllTableNames->getChild( 0 ) ) ) + if( OSQLParseTreeIterator::isTableNode( pAllTableNames->getChild( 0 ) ) ) OSQLParseNode::getTableComponents( pAllTableNames->getChild( 0 ), aCatalog,aSchema, aTableName,NULL ); else if( SQL_ISRULE( pAllTableNames->getChild( 0 ), table_ref ) ) { OSQLParseNode *pNodeForTableName = pAllTableNames->getChild( 0 )->getChild( 0 ); - if( m_aSQLIterator.isTableNode( pNodeForTableName ) ) + if( OSQLParseTreeIterator::isTableNode( pNodeForTableName ) ) { aTableName = OSQLParseNode::getTableRange(pAllTableNames->getChild( 0 )); if( !aTableName.getLength() ) @@ -528,7 +529,7 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper() { - return *const_cast< OCommonStatement* >( this )->getArrayHelper(); + return *getArrayHelper(); } diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 42df8b1c588a..7d92717d5a48 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -196,7 +196,7 @@ namespace connectivity OCommonStatement( OEvoabConnection* _pConnection ); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 817b9e557f5b..fe20ab6914f7 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -63,7 +63,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName) { OEvoabTable* pRet = new OEvoabTable( this, - (OEvoabConnection *)static_cast<OEvoabCatalog&>(m_rParent).getConnection(), + static_cast<OEvoabConnection*>(static_cast<OEvoabCatalog&>(m_rParent).getConnection()), aName, xRow->getString(4), xRow->getString(5), @@ -82,7 +82,7 @@ void OEvoabTables::impl_refresh( ) throw(RuntimeException) static_cast<OEvoabCatalog&>(m_rParent).refreshTables(); } -void OEvoabTables::disposing(void) +void OEvoabTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 252d81657be3..279f9686c0e1 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -38,7 +38,7 @@ namespace connectivity sdbcx::OCollection(_rParent,true,_rMutex,_rVector), m_xMetaData(_rMetaData) {} - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 1394f9361047..3dedc867a44f 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -23,6 +23,7 @@ #endif #include <connectivity/sdbcx/VColumn.hxx> #include "file/FResultSet.hxx" +#include "sqlbison.hxx" #include "file/FResultSetMetaData.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> @@ -137,7 +138,7 @@ void OResultSet::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::cppu::UnoType<sal_Int32>::get()); } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); @@ -798,7 +799,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const IPropertyArrayHelper & OResultSet::getInfoHelper() { - return *const_cast<OResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index a1128455527f..f3b3e5d6f6db 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -20,6 +20,7 @@ #include <osl/diagnose.h> #include "file/FStatement.hxx" #include "file/FConnection.hxx" +#include "sqlbison.hxx" #include "file/FDriver.hxx" #include "file/FResultSet.hxx" #include <comphelper/property.hxx> @@ -230,7 +231,7 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper() { - return *const_cast<OStatement_Base*>(this)->getArrayHelper(); + return *getArrayHelper(); } OResultSet* OStatement::createResultSet() @@ -300,7 +301,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLExc } -void SAL_CALL OStatement_Base::disposing(void) +void SAL_CALL OStatement_Base::disposing() { if(m_aEvaluateRow.is()) { diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 540a5f05ffa0..69ab89cdf9c5 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -116,7 +116,7 @@ Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeExcep return OTable_TYPEDEF::queryInterface(rType); } -void SAL_CALL OFileTable::disposing(void) +void SAL_CALL OFileTable::disposing() { OTable::disposing(); diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index ae5f2cb7cf87..d1402b2c3cd9 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -45,7 +45,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OFileCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 0894d95f9f8e..73a72421903d 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -20,6 +20,7 @@ #include "file/fcode.hxx" #include <osl/diagnose.h> #include <connectivity/sqlparse.hxx> +#include "sqlbison.hxx" #include <i18nlangtag/mslangid.hxx> #include "TConnection.hxx" #include <com/sun/star/sdb/SQLFilterOperator.hpp> diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index fafc90a592a6..682e5d992971 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -34,6 +34,7 @@ #include "file/FDateFunctions.hxx" #include "file/FNumericFunctions.hxx" #include "file/FConnection.hxx" +#include "sqlbison.hxx" using namespace connectivity; using namespace connectivity::file; diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 0c87b3fdfdd4..6e5a8e3ebdff 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -107,7 +107,7 @@ void Blob::closeBlob() } } -void SAL_CALL Blob::disposing(void) +void SAL_CALL Blob::disposing() { try { diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 31f17e6e4a21..5ce33878a791 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -215,7 +215,7 @@ namespace connectivity createCatalog(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index 7725c69980f6..d8785e874fd9 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -68,7 +68,7 @@ namespace connectivity const css::uno::Reference<css::uno::XComponentContext>& getContext() const { return m_aContext; } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index dd71674f704c..4b1477440007 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -780,7 +780,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper() const IPropertyArrayHelper & OResultSet::getInfoHelper() { - return *const_cast<OResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } void SAL_CALL OResultSet::acquire() throw() diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 6f83c850bad2..9c56020ee84e 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -289,7 +289,7 @@ void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeE ::cppu::IPropertyArrayHelper & OStatementCommonBase::getInfoHelper() { - return *const_cast<OStatementCommonBase*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OStatementCommonBase::convertFastPropertyValue( diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 60ac91533450..8ebbad6251d9 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -108,7 +108,7 @@ namespace connectivity using OStatementCommonBase_Base::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE { + virtual void SAL_CALL disposing() SAL_OVERRIDE { disposeResultSet(); OStatementCommonBase_Base::disposing(); } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 1c124d87ec1e..1a48c684d4cd 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -514,7 +514,7 @@ void OFlatTable::refreshColumns() } -void SAL_CALL OFlatTable::disposing(void) +void SAL_CALL OFlatTable::disposing() { OFileTable::disposing(); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index e2b618ab1feb..562fc493b579 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -83,7 +83,7 @@ namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode; namespace connectivity { namespace hsqldb { - void SAL_CALL OHsqlConnection::disposing(void) + void SAL_CALL OHsqlConnection::disposing() { m_aFlushListeners.disposeAndClear( EventObject( *this ) ); OHsqlConnection_BASE::disposing(); diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 632a943bc6ea..79b263d0362c 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -106,7 +106,7 @@ void OHSQLTable::construct() ::cppu::IPropertyArrayHelper & OHSQLTable::getInfoHelper() { - return *static_cast<OHSQLTable_PROP*>(const_cast<OHSQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0); + return *static_cast<OHSQLTable_PROP*>(this)->getArrayHelper(isNew() ? 1 : 0); } sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames) diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index e1850b51859f..227b18edb91e 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -97,7 +97,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OHCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index 124ab58ff641..25e0ccd8ee6b 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -288,7 +288,7 @@ void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const } } -OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const +OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) { OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 13a538371467..157cd8481e9d 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -78,7 +78,7 @@ void HViews::impl_refresh( ) throw(RuntimeException) static_cast<OHCatalog&>(m_rParent).refreshTables(); } -void HViews::disposing(void) +void HViews::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 3d6179cb730e..feadbcec5706 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -541,7 +541,7 @@ bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethodName { m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName ); jboolean out( java_lang_Object::callBooleanMethod(_pMethodName,_inout_MethodID) ); - m_aLogger.log< const sal_Char*, sal_Int16>( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out ); + m_aLogger.log< const sal_Char*, bool>( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out ); return out; } @@ -584,7 +584,7 @@ bool java_sql_DatabaseMetaData::impl_callBooleanMethodWithIntArg( const char* _p jboolean out( callBooleanMethodWithIntArg(_pMethodName,_inout_MethodID,_nArgument) ); - m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out ); + m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, out ); return out; } @@ -1004,7 +1004,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } - m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out ); + m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out ); return out; } @@ -1346,7 +1346,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } - m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out ); + m_aLogger.log< const sal_Char*, bool >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out ); return out; } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index b0a6b1f04e5d..223a47663745 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -106,7 +106,7 @@ jclass java_sql_Statement_Base::getMyClass() const return theClass; } -void SAL_CALL java_sql_Statement_Base::disposing(void) +void SAL_CALL java_sql_Statement_Base::disposing() { m_aLogger.log( LogLevel::FINE, STR_LOG_CLOSING_STATEMENT ); java_sql_Statement_BASE::disposing(); @@ -622,7 +622,7 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLExce ::cppu::IPropertyArrayHelper & java_sql_Statement_Base::getInfoHelper() { - return *const_cast<java_sql_Statement_Base*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool java_sql_Statement_Base::convertFastPropertyValue( diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index af3da44eafba..0ad6bb207f3e 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -891,7 +891,7 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s ::cppu::IPropertyArrayHelper & java_sql_ResultSet::getInfoHelper() { - return *const_cast<java_sql_ResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool java_sql_ResultSet::convertFastPropertyValue( diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index aeb6b3f02795..5fb23e515a9c 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -86,7 +86,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index d33b1ccd302c..bd53ad6a014b 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -174,7 +174,7 @@ namespace connectivity KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index 4e453ec0c332..75910d8bdd06 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -106,7 +106,7 @@ namespace connectivity { return m_xMetaData; } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 24241fc1e7c3..5eab3b7a28a5 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -29,6 +29,7 @@ #include <connectivity/dbexception.hxx> #include "resource/kab_res.hrc" #include "resource/sharedresources.hxx" +#include "sqlbison.hxx" #if OSL_DEBUG_LEVEL > 0 @@ -270,9 +271,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo OUString sColumnName = pColumnRef->getChild(0)->getTokenValue(); bool bAscending = - SQL_ISTOKEN(pAscendingDescending, DESC)? - sal_False: - sal_True; + !SQL_ISTOKEN(pAscendingDescending, DESC); return new KabSimpleOrder(sColumnName, bAscending); } @@ -506,7 +505,7 @@ void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeE ::cppu::IPropertyArrayHelper & KabCommonStatement::getInfoHelper() { - return *const_cast<KabCommonStatement*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool KabCommonStatement::convertFastPropertyValue( diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 6f910d4e25ce..7aa95c01f0ff 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -73,7 +73,7 @@ void KabTables::impl_refresh( ) throw(RuntimeException) static_cast<KabCatalog&>(m_rParent).refreshTables(); } -void KabTables::disposing(void) +void KabTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index 7ea30ce52716..7e66ce514f13 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -45,7 +45,7 @@ namespace connectivity m_xMetaData(_rMetaData) { } - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 8e5c165e2735..f0e6d514a942 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -73,7 +73,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index b783d3082b44..e9dbdb5fc955 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -144,7 +144,7 @@ namespace connectivity MacabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 428e8a7e8441..5970d43a8a69 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -104,7 +104,7 @@ namespace connectivity void setTableName(const OUString& _sTableName); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index a822e09e4219..a7ece0a27cf3 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -19,6 +19,7 @@ #include "MacabStatement.hxx" +#include "sqlbison.hxx" #include "MacabConnection.hxx" #include "MacabAddressBook.hxx" #include "MacabDriver.hxx" @@ -530,7 +531,7 @@ void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, Runtim ::cppu::IPropertyArrayHelper & MacabCommonStatement::getInfoHelper() { - return *const_cast<MacabCommonStatement*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool MacabCommonStatement::convertFastPropertyValue( diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index 6fa6dc45c6a6..7a685f86201f 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -73,7 +73,7 @@ void MacabTables::impl_refresh( ) throw(RuntimeException) static_cast<MacabCatalog&>(m_rParent).refreshTables(); } -void MacabTables::disposing(void) +void MacabTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 293141059ba9..00e723ac3c0b 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -45,7 +45,7 @@ namespace connectivity m_xMetaData(_rMetaData) { } - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index a8692ba9ea86..88d4c2065730 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -105,7 +105,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException // allowed } - return const_cast<OCatalog*>(this)->m_pTables; + return m_pTables; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index 11e796759f23..f843f8eabb48 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -67,7 +67,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 4a2c3eaec862..39eb87d34597 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -73,7 +73,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( ::osl::MutexGuard aGuard( m_aMutex ); ::std::vector< OUString > tables; - if (!m_pMetaDataHelper->getTableStrings(m_pConnection, tables)) + if (!connectivity::mork::MDatabaseMetaDataHelper::getTableStrings(m_pConnection, tables)) { ::connectivity::SharedResources aResources; // TODO: @@ -943,7 +943,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( // aRows = m_pDbMetaDataHelper->getTables( m_pConnection, tableNamePattern ); // pResultSet->setRows( aRows ); ODatabaseMetaDataResultSet::ORows _rRows; - if ( !m_pMetaDataHelper->getTables( m_pConnection, tableNamePattern, _rRows ) ) { + if ( !connectivity::mork::MDatabaseMetaDataHelper::getTables( m_pConnection, tableNamePattern, _rRows ) ) { ::connectivity::SharedResources aResources; // TODO: // get better message here? @@ -963,7 +963,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > xRef = pResult; ::std::vector< OUString > tables; - if ( !m_pMetaDataHelper->getTableStrings( m_pConnection, tables) ) + if ( !connectivity::mork::MDatabaseMetaDataHelper::getTableStrings( m_pConnection, tables) ) { ::connectivity::SharedResources aResources; // TODO: diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index dce1375d12bb..001221100dac 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -31,10 +31,10 @@ namespace connectivity ~MDatabaseMetaDataHelper(); - bool getTableStrings( OConnection* _pCon, - ::std::vector< OUString >& _rStrings); + static bool getTableStrings( OConnection* _pCon, + ::std::vector< OUString >& _rStrings); - bool getTables( OConnection* _pCon, + static bool getTables( OConnection* _pCon, const OUString& tableNamePattern, ODatabaseMetaDataResultSet::ORows& _rRows); }; diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index 36f8a2e6b467..b4394c7fbbf4 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc; extern -::std::vector< sal_Bool > entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry); +::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry); MQueryHelperResultEntry::MQueryHelperResultEntry() { @@ -223,7 +223,7 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression for ( tableIter = Tables->map.begin(); tableIter != Tables->map.end(); ++tableIter ) { if (tableIter->first != 1) break; - Rows = xMork->getRows( 0x80, &tableIter->second ); + Rows = MorkParser::getRows( 0x80, &tableIter->second ); if ( Rows ) { // Iterate all rows @@ -253,9 +253,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); entry->setValue(key, valueOUString); } - ::std::vector< sal_Bool > vector = entryMatchedByExpression(this, &expr, entry); + ::std::vector<bool> vector = entryMatchedByExpression(this, &expr, entry); bool result = true; - for (::std::vector<sal_Bool>::iterator iter = vector.begin(); iter != vector.end(); ++iter) + for (::std::vector<bool>::iterator iter = vector.begin(); iter != vector.end(); ++iter) { result = result && *iter; } @@ -273,9 +273,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression return 0; } -::std::vector< sal_Bool > entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry) +::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry) { - ::std::vector< sal_Bool > resultVector; + ::std::vector<bool> resultVector; MQueryExpression::ExprVector::const_iterator evIter; for( evIter = _aExpr->getExpressions().begin(); evIter != _aExpr->getExpressions().end(); @@ -298,22 +298,22 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression OUString searchedValue = evStr->getValue(); if (evStr->getCond() == MQueryOp::Is) { SAL_INFO("connectivity.mork", "MQueryOp::Is; done"); - resultVector.push_back((currentValue == searchedValue) ? sal_True : sal_False); + resultVector.push_back(currentValue == searchedValue); } else if (evStr->getCond() == MQueryOp::IsNot) { SAL_INFO("connectivity.mork", "MQueryOp::IsNot; done"); - resultVector.push_back((currentValue == searchedValue) ? sal_False : sal_True); + resultVector.push_back(currentValue != searchedValue); } else if (evStr->getCond() == MQueryOp::EndsWith) { SAL_INFO("connectivity.mork", "MQueryOp::EndsWith; done"); - resultVector.push_back((currentValue.endsWith(searchedValue)) ? sal_True : sal_False); + resultVector.push_back(currentValue.endsWith(searchedValue)); } else if (evStr->getCond() == MQueryOp::BeginsWith) { SAL_INFO("connectivity.mork", "MQueryOp::BeginsWith; done"); - resultVector.push_back((currentValue.startsWith(searchedValue)) ? sal_True : sal_False); + resultVector.push_back(currentValue.startsWith(searchedValue)); } else if (evStr->getCond() == MQueryOp::Contains) { SAL_INFO("connectivity.mork", "MQueryOp::Contains; done"); - resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? sal_False : sal_True); + resultVector.push_back(currentValue.indexOf(searchedValue) != -1); } else if (evStr->getCond() == MQueryOp::DoesNotContain) { SAL_INFO("connectivity.mork", "MQueryOp::DoesNotContain; done"); - resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? sal_True : sal_False); + resultVector.push_back(currentValue.indexOf(searchedValue) == -1); } else if (evStr->getCond() == MQueryOp::RegExp) { SAL_INFO("connectivity.mork", "MQueryOp::RegExp; done"); utl::SearchParam param( @@ -326,27 +326,27 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression } } else if (evStr->getCond() == MQueryOp::Exists) { SAL_INFO("connectivity.mork", "MQueryOp::Exists; done"); - resultVector.push_back((currentValue.isEmpty()) ? sal_False : sal_True); + resultVector.push_back(!currentValue.isEmpty()); } else if (evStr->getCond() == MQueryOp::DoesNotExist) { SAL_INFO("connectivity.mork", "MQueryOp::DoesNotExist; done"); - resultVector.push_back((currentValue.isEmpty()) ? sal_True : sal_False); + resultVector.push_back(currentValue.isEmpty()); } } else if ( (*evIter)->isExpr() ) { SAL_INFO("connectivity.mork", "Appending Subquery Expression"); MQueryExpression* queryExpression = static_cast<MQueryExpression*> (*evIter); // recursive call - ::std::vector<sal_Bool> subquery_result = entryMatchedByExpression(_aQuery, queryExpression, entry); + ::std::vector<bool> subquery_result = entryMatchedByExpression(_aQuery, queryExpression, entry); MQueryExpression::bool_cond condition = queryExpression->getExpressionCondition(); if (condition == MQueryExpression::OR) { bool result = false; - for (::std::vector<sal_Bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { + for (::std::vector<bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { result = result || *iter; } resultVector.push_back(result); } else if (condition == MQueryExpression::AND) { bool result = true; - for (::std::vector<sal_Bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { + for (::std::vector<bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { result = result && *iter; } resultVector.push_back(result); diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 40078e675846..ff5351a9701f 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -38,6 +38,7 @@ #include <vector> #include <algorithm> #include "MResultSet.hxx" +#include "sqlbison.hxx" #include "MResultSetMetaData.hxx" #include "FDatabaseMetaDataResultSet.hxx" @@ -108,7 +109,7 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne ,m_nNewRow(0) ,m_nUpdatedRow(0) ,m_RowStates(0) - ,m_bIsReadOnly(-1) + ,m_bIsReadOnly(TRISTATE_INDET) { //m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords()); } @@ -118,7 +119,7 @@ OResultSet::~OResultSet() } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); @@ -351,7 +352,7 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLExcep // else // m_aQuery.resyncRow(cardNumber); - if ( validRow( cardNumber ) == false ) + if ( !validRow( cardNumber ) ) return false; (m_aRow->get())[0] = (sal_Int32)cardNumber; @@ -377,7 +378,7 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLExcep const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - if ( fetchRow( cardNumber ) == false ) + if ( !fetchRow( cardNumber ) ) { OSL_FAIL("fetchRow() returned False" ); m_bWasNull = true; @@ -614,7 +615,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const IPropertyArrayHelper & OResultSet::getInfoHelper() { - return *const_cast<OResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OResultSet::convertFastPropertyValue( @@ -682,7 +683,7 @@ void OResultSet::getFastPropertyValue( break; case PROPERTY_ID_ISBOOKMARKABLE: const_cast< OResultSet* >( this )->determineReadOnly(); - rValue <<= !m_bIsReadOnly; + rValue <<= (m_bIsReadOnly == TRISTATE_FALSE); break; } } @@ -1069,7 +1070,7 @@ void OResultSet::fillRowData() // If the query is a 0=1 then set Row count to 0 and return if ( m_bIsAlwaysFalseQuery ) { - m_bIsReadOnly = 1; + m_bIsReadOnly = TRISTATE_TRUE; return; } @@ -1420,7 +1421,7 @@ bool OResultSet::validRow( sal_uInt32 nRow) #if OSL_DEBUG_LEVEL > 0 OSL_TRACE("validRow: waiting..."); #endif - if (m_aQueryHelper.checkRowAvailable( nRow ) == false) + if (!m_aQueryHelper.checkRowAvailable( nRow )) { SAL_INFO( "connectivity.mork", @@ -1554,7 +1555,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); - if ( fetchCurrentRow() == false ) { + if ( !fetchCurrentRow() ) { m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); } @@ -1646,7 +1647,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); - if ( fetchCurrentRow() == false ) { + if ( !fetchCurrentRow() ) { m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); } @@ -1666,7 +1667,7 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); - if ( fetchCurrentRow() == false ) + if ( !fetchCurrentRow() ) m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this ); checkPendingUpdate(); @@ -1836,14 +1837,14 @@ bool OResultSet::determineReadOnly() { // OSL_FAIL( "OResultSet::determineReadOnly( ) not implemented" ); - if (m_bIsReadOnly == -1) + if (m_bIsReadOnly == TRISTATE_INDET) { - m_bIsReadOnly = sal_True; + m_bIsReadOnly = TRISTATE_TRUE; // OConnection* xConnection = static_cast<OConnection*>(m_pStatement->getConnection().get()); // m_bIsReadOnly = !m_aQueryHelper.isWritable(xConnection) || m_bIsAlwaysFalseQuery; } - return m_bIsReadOnly != 0; + return m_bIsReadOnly != TRISTATE_FALSE; } void OResultSet::setTable(OTable* _rTable) diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 8e90471d9239..e35fa7927837 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/sdbc/XRowUpdate.hpp> #include <cppuhelper/compbase12.hxx> #include <comphelper/proparrhlp.hxx> +#include <tools/gen.hxx> #include "MStatement.hxx" #include "MQueryHelper.hxx" #include <connectivity/CommonTools.hxx> @@ -124,7 +125,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -241,7 +242,7 @@ protected: sal_Int32 m_nNewRow; //inserted row sal_Int32 m_nUpdatedRow; //updated row sal_Int32 m_RowStates; - sal_Int32 m_bIsReadOnly; + TriState m_bIsReadOnly; inline void resetParameters() { m_nParamIndex = 0; } ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns @@ -276,7 +277,7 @@ protected: throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - void checkPendingUpdate() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + static void checkPendingUpdate() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Int32 getCurrentCardNumber(); public: diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 12a672588e42..01fc1fc79ba7 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -42,6 +42,7 @@ #include "diagnose_ex.h" #include "MDriver.hxx" #include "MStatement.hxx" +#include "sqlbison.hxx" #include "MConnection.hxx" #include "MResultSet.hxx" #include "MDatabaseMetaData.hxx" @@ -363,7 +364,7 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper() { - return *const_cast<OCommonStatement*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OCommonStatement::convertFastPropertyValue( diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 2b7a3d04abd8..b5eaffc6fdea 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -153,7 +153,7 @@ namespace connectivity using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 2024e5af52ae..4885d1406e04 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -76,7 +76,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index dfdb02e6b763..b09b6073dab6 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -39,7 +39,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index c430508286cf..d73acc85d338 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -99,7 +99,7 @@ public: /// Returns all rows under specified scope - MorkRowMap *getRows( int rowScope, RowScopeMap *table ); + static MorkRowMap *getRows( int rowScope, RowScopeMap *table ); /// Return value of specified value oid @@ -121,10 +121,10 @@ protected: // Members void initVars(); - bool isWhiteSpace( char c ); + static bool isWhiteSpace( char c ); char nextChar(); - void parseScopeId( const std::string &TextId, int *Id, int *Scope ); + static void parseScopeId( const std::string &TextId, int *Id, int *Scope ); void setCurrentRow( int TableScope, int TableId, int RowScope, int RowId ); // Parse methods diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index c28ddc5e1d0e..8c5f8ba7c09b 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -175,7 +175,7 @@ namespace connectivity -extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) +extern "C" const sal_Unicode* SAL_CALL getUserProfile() { static sal_Bool bReadConfig = sal_False; static OUString sUserProfile; @@ -188,7 +188,7 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) return sUserProfile.getStr(); } -extern "C" const sal_Char* SAL_CALL getPabDescription( void ) +extern "C" const sal_Char* SAL_CALL getPabDescription() { static sal_Bool bReadConfig = sal_False; static OUString usPabDescription; @@ -208,7 +208,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) } -extern "C" const sal_Char* SAL_CALL getHisDescription( void ) +extern "C" const sal_Char* SAL_CALL getHisDescription() { static sal_Bool bReadConfig = sal_False; static OUString usHisDescription; diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx index 9e7048ef0df9..25c1fc3e0f13 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx @@ -22,11 +22,11 @@ #include <sal/types.h> -extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ); +extern "C" const sal_Unicode* SAL_CALL getUserProfile(); -extern "C" const sal_Char* SAL_CALL getPabDescription( void ); +extern "C" const sal_Char* SAL_CALL getPabDescription(); -extern "C" const sal_Char* SAL_CALL getHisDescription( void ); +extern "C" const sal_Char* SAL_CALL getHisDescription(); #endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCONFIGACCESS_HXX diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 112f97e85308..ec7d017b6a44 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -134,7 +134,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); @@ -193,9 +193,9 @@ namespace connectivity // Get whether use ssl to connect to ldap sal_Bool getUseSSL() const {return m_bUseSSL;} - sal_Bool usesFactory(void) const { return (m_eSDBCAddressType == SDBCAddress::Outlook) || (m_eSDBCAddressType == SDBCAddress::OutlookExp); } - sal_Bool isLDAP(void) const { return m_eSDBCAddressType == SDBCAddress::LDAP; } - sal_Bool isThunderbird(void) const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } + sal_Bool usesFactory() const { return (m_eSDBCAddressType == SDBCAddress::Outlook) || (m_eSDBCAddressType == SDBCAddress::OutlookExp); } + sal_Bool isLDAP() const { return m_eSDBCAddressType == SDBCAddress::LDAP; } + sal_Bool isThunderbird() const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index 842342324828..37545c83aa0c 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -74,7 +74,7 @@ namespace connectivity MozabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); @@ -92,7 +92,7 @@ namespace connectivity virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory(void) const { return m_xMSFactory; } + & getMSFactory() const { return m_xMSFactory; } private: EDriverType impl_classifyURL( const OUString& url ); diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 118e4116b8fa..427b3d6256d7 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -42,6 +42,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include "resource/mozab_res.hrc" #include "resource/common_res.hrc" +#include "sqlbison.hxx" #if OSL_DEBUG_LEVEL > 0 # define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) @@ -117,7 +118,7 @@ OResultSet::~OResultSet() } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index dfebeff19882..22e30ec1d783 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -125,7 +125,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index b76698f5b915..d7130ff79dc0 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -47,6 +47,7 @@ #include "MDatabaseMetaData.hxx" #include "resource/mozab_res.hrc" #include "resource/common_res.hrc" +#include "sqlbison.hxx" #if OSL_DEBUG_LEVEL > 0 # define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 070e74747467..59b30fb3ad7e 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -155,7 +155,7 @@ namespace connectivity using OCommonStatement_IBASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index 3cc06c694692..129c84dd493f 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -76,7 +76,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index 5193b98fed08..dbd694b3ef73 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.hxx @@ -39,7 +39,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); }; } } diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 3fe8d5515276..58ff8fd3cffb 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -51,7 +51,7 @@ namespace connectivity MozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); @@ -83,7 +83,7 @@ namespace connectivity virtual ::sal_Int32 SAL_CALL Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - & getMSFactory(void) const { return m_xMSFactory; } + & getMSFactory() const { return m_xMSFactory; } }; } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index a3429b70bc1f..82fbccd366b8 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -246,7 +246,7 @@ namespace connectivity { namespace mozab { } - NS_IMETHODIMP MLdapAttributeMap::CheckState(void) + NS_IMETHODIMP MLdapAttributeMap::CheckState() { // we do not allow modifying the map, so we're always in a valid state return NS_OK; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 8b24a4266d55..fe2f8f7c4a01 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -592,13 +592,13 @@ MQuery::getRealRowCount() // false sal_Bool -MQuery::queryComplete( void ) +MQuery::queryComplete() { return hadError() || m_aQueryHelper->queryComplete(); } sal_Bool -MQuery::waitForQueryComplete( void ) +MQuery::waitForQueryComplete() { if( m_aQueryHelper->waitForQueryComplete( ) ) return sal_True; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index 08facee24cd5..524fe5e0014b 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -234,10 +234,10 @@ namespace connectivity void setMaxNrOfReturns( const sal_Int32); - sal_Int32 getRowCount( void ); - sal_uInt32 getRealRowCount( void ); - sal_Bool queryComplete( void ); - sal_Bool waitForQueryComplete( void ); + sal_Int32 getRowCount(); + sal_uInt32 getRealRowCount(); + sal_Bool queryComplete(); + sal_Bool waitForQueryComplete(); sal_Bool checkRowAvailable( sal_Int32 nDBRow ); sal_Bool getRowValue( connectivity::ORowSetValue& rValue, sal_Int32 nDBRow, diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 8268773903fd..74a8744072d9 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -125,7 +125,7 @@ void OMySQLTable::construct() ::cppu::IPropertyArrayHelper & OMySQLTable::getInfoHelper() { - return *static_cast<OMySQLTable_PROP*>(const_cast<OMySQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0); + return *static_cast<OMySQLTable_PROP*>(this)->getArrayHelper(isNew() ? 1 : 0); } sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames) diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index e1c2fb6e7589..25949eb04177 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -102,7 +102,7 @@ void OTables::impl_refresh( ) throw(RuntimeException) static_cast<OMySQLCatalog&>(m_rParent).refreshTables(); } -void OTables::disposing(void) +void OTables::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index 709e98445c82..6c9a4660720a 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -281,7 +281,7 @@ void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const } } -OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const +OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) { OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index a7ec2cac6310..cfe2998bf25d 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -72,7 +72,7 @@ void OViews::impl_refresh( ) throw(RuntimeException) static_cast<OMySQLCatalog&>(m_rParent).refreshTables(); } -void OViews::disposing(void) +void OViews::disposing() { m_xMetaData.clear(); OCollection::disposing(); diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 25105b06828e..0672d7e9081a 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -86,7 +86,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet() delete [] m_pRowStatusArray; } -void ODatabaseMetaDataResultSet::disposing(void) +void ODatabaseMetaDataResultSet::disposing() { OPropertySetHelper::disposing(); @@ -695,13 +695,13 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, Run return Any(); } -sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, RuntimeException) +sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() throw(SQLException, RuntimeException) { sal_Int32 nValue=1; return nValue; } -OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, RuntimeException) +OUString ODatabaseMetaDataResultSet::getCursorName() throw(SQLException, RuntimeException) { return OUString(); } @@ -729,7 +729,7 @@ OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, R ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper() { - return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index c3eadb098cc6..3d2a9f42eda3 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -181,7 +181,7 @@ void OResultSet::construct() osl_atomic_decrement( &m_refCount ); } -void OResultSet::disposing(void) +void OResultSet::disposing() { SQLRETURN nRet = N3SQLCloseCursor(m_aStatementHandle); OSL_UNUSED( nRet ); @@ -1434,7 +1434,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const IPropertyArrayHelper & OResultSet::getInfoHelper() { - return *const_cast<OResultSet*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OResultSet::convertFastPropertyValue( diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index ca6cec3499c6..2259ca9e1be0 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -25,7 +25,6 @@ #include "odbc/OResultSet.hxx" #include <comphelper/property.hxx> #include "odbc/OTools.hxx" -#include <comphelper/uno3.hxx> #include <osl/thread.h> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> @@ -98,7 +97,7 @@ void OStatement_Base::disposeResultSet() m_xResultSet.clear(); } -void SAL_CALL OStatement_Base::disposing(void) +void SAL_CALL OStatement_Base::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -226,8 +225,9 @@ void OStatement_Base::clearMyResultSet() try { - Reference<XCloseable> xCloseable; - if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) ) + Reference<XCloseable> xCloseable( + m_xResultSet.get(), css::uno::UNO_QUERY); + if ( xCloseable.is() ) xCloseable->close(); } catch( const DisposedException& ) { } @@ -915,7 +915,7 @@ void OStatement_Base::setUsingBookmarks(bool _bUseBookmark) ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper() { - return *const_cast<OStatement_Base*>(this)->getArrayHelper(); + return *getArrayHelper(); } sal_Bool OStatement_Base::convertFastPropertyValue( diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 7ef8ced84202..ed7470a6100a 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -136,7 +136,7 @@ OUString ConnectionGetImplementationName() { return OUString( "org.openoffice.comp.connectivity.pq.Connection.noext" ); } -com::sun::star::uno::Sequence<OUString> ConnectionGetSupportedServiceNames(void) +com::sun::star::uno::Sequence<OUString> ConnectionGetSupportedServiceNames() { OUString serv( "com.sun.star.sdbc.Connection" ); return Sequence< OUString> (&serv,1); diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index c020893df624..0e2b839a7757 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -147,7 +147,7 @@ sal_Bool Driver::supportsService(const OUString& ServiceName) return cppu::supportsService(this, ServiceName); } -Sequence< OUString > Driver::getSupportedServiceNames(void) +Sequence< OUString > Driver::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return DriverGetSupportedServiceNames(); @@ -225,7 +225,7 @@ public: return sal_True; return sal_False; } - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_serviceNames; diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index f1afe29be07b..0751184d6336 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -104,7 +104,7 @@ public: // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XDataDefinitionSupplier diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 5ae9d45ae5e2..5e1d9918d99b 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -153,7 +153,7 @@ sal_Bool ReflectionBase::supportsService(const OUString& ServiceName) return cppu::supportsService(this, ServiceName); } -Sequence< OUString > ReflectionBase::getSupportedServiceNames(void) +Sequence< OUString > ReflectionBase::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { return m_supportedServices; diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index 3603fcda9b37..fff7f55025a3 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -115,7 +115,7 @@ public: // XServiceInfo throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // XTypeProvider, first implemented by OPropertySetHelper diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index 1aafe39de5ee..0e5d5084d10c 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -161,7 +161,7 @@ namespace connectivity virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index 58c1f17a84ab..fcc589f5efb4 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -72,7 +72,7 @@ namespace connectivity getConnectionInfo() const { return m_aConnectionInfo; } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index 2737d0d50139..198f95205814 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -38,7 +38,7 @@ namespace connectivity ,const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XResultSet virtual sal_Bool SAL_CALL next( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 1b1adff81227..7b45d1bf594b 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -86,7 +86,7 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL release() throw(); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 59adc3365df3..b9d740eec8f6 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -117,7 +117,7 @@ namespace connectivity ~ODatabaseMetaDataResultSet(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 3dbf7c98bf88..3195666e58d2 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -56,7 +56,7 @@ namespace connectivity ~ODriver(); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx index 3a46f1faf509..7d0b22d87831 100644 --- a/connectivity/source/inc/ado/APreparedStatement.hxx +++ b/connectivity/source/inc/ado/APreparedStatement.hxx @@ -103,7 +103,7 @@ namespace connectivity // XResultSetMetaDataSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); }; } } diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 3319a9ff9208..f9d1312f0205 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -121,7 +121,7 @@ namespace connectivity virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(); diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index 356a37a80e7b..45798fb5f337 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -138,7 +138,7 @@ namespace connectivity using OStatement_BASE::operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >; // OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index 02327a0f10c7..9b1231a27918 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -46,7 +46,7 @@ namespace connectivity virtual void refreshIndexes(); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); public: OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable); diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index b66d892570ac..cda44ef9ccee 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -55,7 +55,7 @@ namespace connectivity DECLARE_SERVICE_INFO(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 491c17e20da4..4e8ea641dded 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -79,7 +79,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 915503d0cca0..e30d3035614d 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -145,7 +145,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 5cf87e78fe5f..dc2dbdc41feb 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.hxx @@ -55,7 +55,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::cppu::OComponentHelper virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 43d430d012af..2b6bc47069f6 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -87,7 +87,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 1f0e466ec741..42374972b569 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -48,7 +48,7 @@ namespace connectivity OFileDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index 07d1302bda31..da00bebe5552 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -77,7 +77,7 @@ namespace connectivity virtual void construct(const OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index cb7de4bda3e7..d89d9700f176 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -132,7 +132,7 @@ namespace connectivity bool m_bShowDeleted; bool m_bIsCount; - void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount); + static void initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount); void construct(); //sal_Bool evaluate(); @@ -178,7 +178,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 0706b83c682e..b7747c8b6c63 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -145,7 +145,7 @@ namespace connectivity virtual void construct(const OUString& sql) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface // virtual void SAL_CALL release() throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -175,7 +175,7 @@ namespace connectivity OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ), connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this){} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index 27fcaa46b431..93f5a1af7f8d 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -68,7 +68,7 @@ namespace connectivity virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; OConnection* getConnection() const { return m_pConnection;} virtual sal_Int32 getCurrentLastPos() const {return -1;} diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index 74ac0dce6f86..2c91b2221c3f 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -45,7 +45,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } } diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index d03d4f7af93e..f45fe0fd5ba3 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -95,7 +95,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index 45ae3edfb96a..5c380e0a7640 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -64,7 +64,7 @@ namespace connectivity bool m_bReadOnly; protected: - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ~OHsqlConnection(); public: diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 099182b940b7..e7921a484b7f 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -119,7 +119,7 @@ namespace connectivity /// dtor virtual ~ODriverDelegator(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** called when we connected to a newly created embedded database */ diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index bd553d1ec56a..75c95e013a37 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -45,7 +45,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XDrop void appendNew(const OUString& _rsNewTable); diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx index f9ab04891ffb..2e626f79ee52 100644 --- a/connectivity/source/inc/hsqldb/HUser.hxx +++ b/connectivity/source/inc/hsqldb/HUser.hxx @@ -33,7 +33,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - OUString getPrivilegeString(sal_Int32 nRights) const; + static OUString getPrivilegeString(sal_Int32 nRights); // return the privileges and additional the grant rights void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index fd72e431f710..1650b4030a63 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -45,7 +45,7 @@ namespace connectivity ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector ); // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void dropByNameImpl(const OUString& elementName); }; diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index a61f89addcb6..47281e4a58ca 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -110,7 +110,7 @@ namespace connectivity const jdbc::GlobalRef< jobject >& getDriverClassLoader() const { return m_pDriverClassLoader; } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index b2b321ad78f4..716e14d8a15f 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -130,7 +130,7 @@ namespace connectivity sal_Int32 getStatementObjectID() const { return m_aLogger.getObjectID(); } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; @@ -173,7 +173,7 @@ namespace connectivity OSubComponent<OStatement_BASE2, java_sql_Statement_BASE>(static_cast<cppu::OWeakObject*>(&_rCon), this){} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; }; diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 07a0653c9a6a..56fe7f364951 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -106,7 +106,7 @@ namespace connectivity java_sql_Statement_Base* pStmt = NULL ); // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index ac0600330153..1634092d68fd 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -103,7 +103,7 @@ namespace connectivity /// dtor virtual ~ODriverDelegator(); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; }; } diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 84715849a680..e3bb892c8ed5 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -47,7 +47,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XDrop void appendNew(const OUString& _rsNewTable); diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx index 848da1f28493..f274f7e17597 100644 --- a/connectivity/source/inc/mysql/YUser.hxx +++ b/connectivity/source/inc/mysql/YUser.hxx @@ -33,7 +33,7 @@ namespace connectivity { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - OUString getPrivilegeString(sal_Int32 nRights) const; + static OUString getPrivilegeString(sal_Int32 nRights); // return the privileges and additional the grant rights void findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); public: diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index 22485967ba88..8e554c6e6828 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -46,7 +46,7 @@ namespace connectivity {} // only the name is identical to ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void dropByNameImpl(const OUString& elementName); }; diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 59e645ef903c..dbf8f3772d85 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -93,7 +93,7 @@ namespace connectivity void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index eaee603d6571..08f307ec8c93 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -86,8 +86,8 @@ namespace connectivity static sal_Int32 getResultSetConcurrency() { return css::sdbc::ResultSetConcurrency::READ_ONLY; } static sal_Int32 getResultSetType() { return css::sdbc::ResultSetType::FORWARD_ONLY; } static sal_Int32 getFetchDirection() { return css::sdbc::FetchDirection::FORWARD; } - sal_Int32 getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - OUString getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + static sal_Int32 getFetchSize() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + static OUString getCursorName() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); SWORD impl_getColumnType_nothrow(sal_Int32 columnIndex); sal_Int32 mapColumn (sal_Int32 column); @@ -127,7 +127,7 @@ namespace connectivity return m_pConnection->getOdbcFunction(_nIndex); } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index e50e951fed6d..1612e7fab913 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -56,7 +56,7 @@ namespace connectivity // only possibility to get the odbc functions virtual oslGenericFunction getOdbcFunction(sal_Int32 _nIndex) const = 0; // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 104f617086eb..f7dda14b73fa 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -234,7 +234,7 @@ namespace connectivity inline void setMetaData(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index aa71fb544ac7..9a8297a35f7d 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -157,7 +157,7 @@ namespace connectivity return m_pConnection->getOdbcFunction(_nIndex); } // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; @@ -212,7 +212,7 @@ namespace connectivity OStatement_BASE2(OConnection* _pConnection ) : OStatement_Base(_pConnection ), ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this){} // OComponentHelper - virtual void SAL_CALL disposing(void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface virtual void SAL_CALL release() throw() SAL_OVERRIDE; }; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index dbe05776d656..4e5b8b473574 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -20,6 +20,7 @@ #include <connectivity/sqliterator.hxx> #include <connectivity/sdbcx/VTable.hxx> #include <connectivity/sqlparse.hxx> +#include "sqlbison.hxx" #include <connectivity/dbtools.hxx> #include <connectivity/sqlerror.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> @@ -1975,7 +1976,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const return pHavingClause; } -bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const +bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) { return _pTableNode && (SQL_ISRULE(_pTableNode,catalog_name) || SQL_ISRULE(_pTableNode,schema_name) || diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index a2eab485d658..a45671361930 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -225,7 +225,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter() //= OSQLParseNode -OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const +OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) { Date aDate = DBTypeConversion::toDate(rString); Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier()); @@ -237,7 +237,7 @@ OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, c } -OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const +OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) { DateTime aDate = DBTypeConversion::toDateTime(rString); Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier()); @@ -249,7 +249,7 @@ OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rPara } -OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const +OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) { css::util::Time aTime = DBTypeConversion::toTime(rString); Reference< XNumberFormatsSupplier > xSupplier(rParam.xFormatter->getNumberFormatsSupplier()); diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index c43cc185d92d..3dd1d9a5455e 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -293,7 +293,7 @@ void OCollection::clear_NoDispose() } -void OCollection::disposing(void) +void OCollection::disposing() { m_aContainerListeners.disposeAndClear(EventObject(static_cast<XTypeProvider*>(this))); m_aRefreshListeners.disposeAndClear(EventObject(static_cast<XTypeProvider*>(this))); diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 6653c014192e..bc2d2185d359 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -172,7 +172,7 @@ void OColumn::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, nAttrib, &m_TableName, cppu::UnoType<decltype(m_TableName)>::get()); } -void OColumn::disposing(void) +void OColumn::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index c71f22e50fc8..6ebb5c1639cc 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -67,7 +67,7 @@ Sequence< Type > SAL_CALL OGroup::getTypes( ) throw(RuntimeException, std::exce return ::comphelper::concatSequences(ODescriptor::getTypes(),OGroup_BASE::getTypes()); } -void OGroup::disposing(void) +void OGroup::disposing() { OPropertySetHelper::disposing(); @@ -86,7 +86,7 @@ void OGroup::disposing(void) ::cppu::IPropertyArrayHelper & OGroup::getInfoHelper() { - return *const_cast<OGroup*>(this)->getArrayHelper(); + return *getArrayHelper(); } Reference< XNameAccess > SAL_CALL OGroup::getUsers( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index bcbf6e5e804f..e7dee0361cec 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -133,7 +133,7 @@ void OIndex::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, cppu::UnoType<bool>::get()); } -void OIndex::disposing(void) +void OIndex::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index ccd9e9b53881..59d820659538 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -148,7 +148,7 @@ void SAL_CALL OKey::disposing() ::cppu::IPropertyArrayHelper & OKey::getInfoHelper() { - return *const_cast<OKey*>(this)->getArrayHelper(isNew() ? 1 : 0); + return *getArrayHelper(isNew() ? 1 : 0); } Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OKey::getColumns( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index dffe47b8b611..7a4d453febb3 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -145,7 +145,7 @@ Sequence< Type > SAL_CALL OTable::getTypes( ) throw(RuntimeException, std::exce return ::comphelper::concatSequences(ODescriptor::getTypes(),OTableDescriptor_BASE::getTypes(),OTable_BASE::getTypes()); } -void SAL_CALL OTable::disposing(void) +void SAL_CALL OTable::disposing() { ODescriptor::disposing(); @@ -220,7 +220,7 @@ cppu::IPropertyArrayHelper* OTable::createArrayHelper( sal_Int32 /*_nId*/ ) cons cppu::IPropertyArrayHelper & OTable::getInfoHelper() { - return *const_cast<OTable*>(this)->getArrayHelper(isNew() ? 1 : 0); + return *getArrayHelper(isNew() ? 1 : 0); } Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor( ) throw(RuntimeException, std::exception) diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 393493b67dae..7d5067248ba3 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -57,7 +57,7 @@ OUser::~OUser( ) delete m_pGroups; } -void OUser::disposing(void) +void OUser::disposing() { OPropertySetHelper::disposing(); ::osl::MutexGuard aGuard(m_aMutex); @@ -86,7 +86,7 @@ Sequence< Type > SAL_CALL OUser::getTypes( ) throw(RuntimeException, std::excep ::cppu::IPropertyArrayHelper & OUser::getInfoHelper() { - return *const_cast<OUser*>(this)->getArrayHelper(); + return *getArrayHelper(); } // XUser diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index be69eb632cf1..a1c9813b4a33 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -93,7 +93,7 @@ Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException, ::cppu::IPropertyArrayHelper & OView::getInfoHelper() { - return *const_cast<OView*>(this)->getArrayHelper(isNew() ? 1 : 0); + return *getArrayHelper(isNew() ? 1 : 0); } OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException, std::exception) diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx deleted file mode 100644 index 2843b674e6f9..000000000000 --- a/connectivity/source/simpledbt/charset_s.cxx +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "charset_s.hxx" - - -namespace connectivity -{ - - - using namespace ::dbtools; - - - //= ODataAccessCharSet - - - sal_Int32 ODataAccessCharSet::getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) const - { - _rEncs.clear(); - - OCharsetMap::const_iterator aLoop = m_aCharsetInfo.begin(); - OCharsetMap::const_iterator aLoopEnd = m_aCharsetInfo.end(); - while (aLoop != aLoopEnd) - { - _rEncs.push_back( (*aLoop).getEncoding() ); - ++aLoop; - } - - return _rEncs.size(); - } - - -} // namespace connectivity - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx deleted file mode 100644 index 25aa2bfc7630..000000000000 --- a/connectivity/source/simpledbt/charset_s.hxx +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_CHARSET_S_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_CHARSET_S_HXX - -#include <connectivity/virtualdbtools.hxx> -#include <connectivity/dbcharset.hxx> - - -namespace connectivity -{ - - - - //= ODataAccessCharSet - - class ODataAccessCharSet : public simple::IDataAccessCharSet - { - protected: - ::dbtools::OCharsetMap m_aCharsetInfo; - - public: - ODataAccessCharSet() { } - - // IDataAccessCharSet - sal_Int32 getSupportedTextEncodings( - ::std::vector< rtl_TextEncoding >& /* [out] */ _rEncs - ) const SAL_OVERRIDE; - }; - - -} // namespace connectivity - - -#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_CHARSET_S_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx deleted file mode 100644 index cead9fab7fe8..000000000000 --- a/connectivity/source/simpledbt/dbtfactory.cxx +++ /dev/null @@ -1,95 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include <connectivity/virtualdbtools.hxx> -#include <connectivity/formattedcolumnvalue.hxx> -#include "dbtfactory.hxx" -#include "parser_s.hxx" -#include "staticdbtools_s.hxx" -#include "charset_s.hxx" - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; - - -// the entry point for load-on-call usage of the DBTOOLS lib -#if HAVE_FEATURE_DESKTOP -extern "C" void* SAL_CALL createDataAccessToolsFactory() -{ - ::connectivity::ODataAccessToolsFactory* pFactory = new ::connectivity::ODataAccessToolsFactory; - pFactory->acquire(); - return pFactory; -} -#endif - -namespace connectivity -{ - - - - //= ODataAccessToolsFactory - - - ODataAccessToolsFactory::ODataAccessToolsFactory() - { - ODataAccessStaticTools* pStaticTools = new ODataAccessStaticTools; - m_xTypeConversionHelper = pStaticTools; - m_xToolsHelper = pStaticTools; - } - - - ::rtl::Reference< simple::IDataAccessTypeConversion > ODataAccessToolsFactory::getTypeConversionHelper() - { - return m_xTypeConversionHelper; - } - - - ::rtl::Reference< simple::IDataAccessCharSet > ODataAccessToolsFactory::createCharsetHelper( ) const - { - return new ODataAccessCharSet; - } - - - ::rtl::Reference< simple::IDataAccessTools > ODataAccessToolsFactory::getDataAccessTools() - { - return m_xToolsHelper; - } - - - ::std::unique_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, const Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) - { - ::std::unique_ptr< ::dbtools::FormattedColumnValue > pValue( new ::dbtools::FormattedColumnValue( _rxContext, _rxRowSet, _rxColumn ) ); - return pValue; - } - - - ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext) const - { - return new OSimpleSQLParser(rxContext, _pContext); - } - - -} // namespace connectivity - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx deleted file mode 100644 index 7631606a4892..000000000000 --- a/connectivity/source/simpledbt/dbtfactory.hxx +++ /dev/null @@ -1,69 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_DBTFACTORY_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_DBTFACTORY_HXX - -#include <connectivity/virtualdbtools.hxx> - - -namespace connectivity -{ - - - - //= ODataAccessToolsFactory - - class ODataAccessToolsFactory : public simple::IDataAccessToolsFactory - { - protected: - ::rtl::Reference< simple::IDataAccessTypeConversion > m_xTypeConversionHelper; - ::rtl::Reference< simple::IDataAccessTools > m_xToolsHelper; - - public: - ODataAccessToolsFactory(); - virtual ~ODataAccessToolsFactory() {} - - // IDataAccessToolsFactory - virtual ::rtl::Reference< simple::ISQLParser > createSQLParser( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const IParseContext* _pContext - ) const SAL_OVERRIDE; - - virtual ::rtl::Reference< simple::IDataAccessCharSet > createCharsetHelper( ) const SAL_OVERRIDE; - - virtual ::rtl::Reference< simple::IDataAccessTypeConversion > getTypeConversionHelper() SAL_OVERRIDE; - - virtual ::rtl::Reference< simple::IDataAccessTools > getDataAccessTools() SAL_OVERRIDE; - - virtual ::std::unique_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxRowSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn - ) SAL_OVERRIDE; - - }; - - -} // namespace connectivity - - -#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_DBTFACTORY_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx deleted file mode 100644 index 07e1402797f9..000000000000 --- a/connectivity/source/simpledbt/parsenode_s.cxx +++ /dev/null @@ -1,73 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <connectivity/virtualdbtools.hxx> -#include "parsenode_s.hxx" -#include <connectivity/sqlnode.hxx> - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::sdbc; - - -namespace connectivity -{ - - - - //= OSimpleParseNode - - - OSimpleParseNode::OSimpleParseNode(const OSQLParseNode* _pNode, bool _bTakeOwnership) - :m_pFullNode(_pNode) - ,m_bOwner(_bTakeOwnership) - { - OSL_ENSURE(m_pFullNode, "OSimpleParseNode::OSimpleParseNode: invalid node given!"); - } - - - OSimpleParseNode::~OSimpleParseNode() - { - if (m_bOwner) - delete m_pFullNode; - } - - void OSimpleParseNode::parseNodeToStr(OUString& _rString, const Reference< XConnection >& _rxConnection,const IParseContext* _pContext) const - { - m_pFullNode->parseNodeToStr( _rString, _rxConnection, _pContext ); - } - - - void OSimpleParseNode::parseNodeToPredicateStr(OUString& _rString, const Reference< XConnection >& _rxConnection, - const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField, - const OUString &_sPredicateTableAlias, - const Locale& _rIntl, const sal_Char _cDecSeparator,const IParseContext* _pContext) const - { - m_pFullNode->parseNodeToPredicateStr( _rString, _rxConnection, _rxFormatter, _rxField, _sPredicateTableAlias, - _rIntl, _cDecSeparator, _pContext ); - } - - -} // namespace connectivity - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx deleted file mode 100644 index 42e47be228c5..000000000000 --- a/connectivity/source/simpledbt/parsenode_s.hxx +++ /dev/null @@ -1,68 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSENODE_S_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSENODE_S_HXX - -#include <connectivity/virtualdbtools.hxx> - - -namespace connectivity -{ - - - class OSQLParseNode; - - //= OSimpleParseNode - - class OSimpleParseNode : public simple::ISQLParseNode - { - protected: - const OSQLParseNode* m_pFullNode; - bool m_bOwner; - - public: - OSimpleParseNode(const OSQLParseNode* _pNode, bool _bTakeOwnership = true); - virtual ~OSimpleParseNode(); - - // ISQLParseNode - virtual void parseNodeToStr(OUString& _rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const IParseContext* _pContext - ) const SAL_OVERRIDE; - - virtual void parseNodeToPredicateStr(OUString& _rString, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, - const OUString &_sPredicateTableAlias, - const ::com::sun::star::lang::Locale& _rIntl, - const sal_Char _cDecSeparator, - const IParseContext* _pContext - ) const SAL_OVERRIDE; - }; - - -} // namespace connectivity - - -#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSENODE_S_HXX - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx deleted file mode 100644 index eddae295e7cb..000000000000 --- a/connectivity/source/simpledbt/parser_s.cxx +++ /dev/null @@ -1,65 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <connectivity/virtualdbtools.hxx> -#include "parser_s.hxx" -#include "parsenode_s.hxx" - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; - - -namespace connectivity -{ - - - - //= OSimpleSQLParser - - - OSimpleSQLParser::OSimpleSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext) - :m_aFullParser(rxContext, _pContext) - { - } - - - const IParseContext& OSimpleSQLParser::getContext() const - { - return m_aFullParser.getContext(); - } - - - ::rtl::Reference< simple::ISQLParseNode > OSimpleSQLParser::predicateTree(OUString& rErrorMessage, const OUString& rStatement, - const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField) const - { - OSimpleParseNode* pReturn = NULL; - OSQLParseNode* pFullNode = const_cast<OSimpleSQLParser*>(this)->m_aFullParser.predicateTree(rErrorMessage, rStatement, _rxFormatter, _rxField); - if (pFullNode) - pReturn = new OSimpleParseNode(pFullNode, true); - return pReturn; - } - - -} // namespace connectivity - - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx deleted file mode 100644 index 359ab25c6366..000000000000 --- a/connectivity/source/simpledbt/parser_s.hxx +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSER_S_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSER_S_HXX - -#include <connectivity/virtualdbtools.hxx> -#include <connectivity/sqlparse.hxx> - - -namespace connectivity -{ - - - - //= OSimpleSQLParser - - class OSimpleSQLParser : public simple::ISQLParser - { - protected: - OSQLParser m_aFullParser; - - public: - OSimpleSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext); - - // ISQLParser - virtual ::rtl::Reference< simple::ISQLParseNode > predicateTree( - OUString& rErrorMessage, - const OUString& rStatement, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField - ) const SAL_OVERRIDE; - - virtual const IParseContext& getContext() const SAL_OVERRIDE; - }; - - -} // namespace connectivity - - -#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_PARSER_S_HXX - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx deleted file mode 100644 index fb5587f02db7..000000000000 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <connectivity/virtualdbtools.hxx> -#include "staticdbtools_s.hxx" -#include <connectivity/dbconversion.hxx> -#include <connectivity/dbtools.hxx> -#include <com/sun/star/sdb/SQLContext.hpp> - - -namespace connectivity -{ - - - using namespace ::com::sun::star::util; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::sdb; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::container; - - - //= ODataAccessStaticTools - - - ODataAccessStaticTools::ODataAccessStaticTools() - { - } - - - Date ODataAccessStaticTools::getStandardDate() const - { - return ::dbtools::DBTypeConversion::getStandardDate(); - } - - - double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate ) const - { - return ::dbtools::DBTypeConversion::getValue( _rxVariant, rNullDate ); - } - - - OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter, - const Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const - { - return ::dbtools::DBTypeConversion::getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); - } - - - OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter, - const Locale& _rLocale, const Date& _rNullDate ) const - { - return ::dbtools::DBTypeConversion::getFormattedValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate ); - } - - - Reference< XConnection> ODataAccessStaticTools::getConnection_withFeedback(const OUString& _rDataSourceName, const OUString& _rUser, - const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const - { - return ::dbtools::getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext); - } - - - Reference< XConnection> ODataAccessStaticTools::connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, bool _bSetAsActiveConnection) const - { - return ::dbtools::connectRowset( _rxRowSet, _rxContext, _bSetAsActiveConnection); - } - - - Reference< XConnection> ODataAccessStaticTools::getRowSetConnection( - const Reference< XRowSet>& _rxRowSet) - const - { - return ::dbtools::getConnection(_rxRowSet); - } - - - Reference< XNumberFormatsSupplier> ODataAccessStaticTools::getNumberFormats(const Reference< XConnection>& _rxConn, bool _bAllowDefault) const - { - return ::dbtools::getNumberFormats(_rxConn, _bAllowDefault); - } - - - sal_Int32 ODataAccessStaticTools::getDefaultNumberFormat( const Reference< XPropertySet >& _rxColumn, const Reference< XNumberFormatTypes >& _rxTypes, - const Locale& _rLocale ) const - { - return ::dbtools::getDefaultNumberFormat( _rxColumn, _rxTypes, _rLocale ); - } - - - void ODataAccessStaticTools::TransferFormComponentProperties(const Reference< XPropertySet>& _rxOld, const Reference< XPropertySet>& _rxNew, const Locale& _rLocale) const - { - ::dbtools::TransferFormComponentProperties(_rxOld, _rxNew, _rLocale); - } - - - OUString ODataAccessStaticTools::quoteName(const OUString& _rQuote, const OUString& _rName) const - { - return ::dbtools::quoteName(_rQuote, _rName); - } - - - OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName ) const - { - return ::dbtools::composeTableNameForSelect( _rxConnection, _rCatalog, _rSchema, _rName ); - } - - - OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const - { - return ::dbtools::composeTableNameForSelect( _rxConnection, _xTable ); - } - - - SQLContext ODataAccessStaticTools::prependContextInfo(SQLException& _rException, const Reference< XInterface >& _rxContext, - const OUString& _rContextDescription, const OUString& _rContextDetails) const - { - return ::dbtools::prependContextInfo(_rException, _rxContext, _rContextDescription, _rContextDetails); - } - - - Reference< XDataSource > ODataAccessStaticTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const - { - return ::dbtools::getDataSource( _rsRegisteredName, _rxContext ); - } - - - bool ODataAccessStaticTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const - { - return ::dbtools::canInsert( _rxCursorSet ); - } - - - bool ODataAccessStaticTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const - { - return ::dbtools::canUpdate( _rxCursorSet ); - } - - - bool ODataAccessStaticTools::canDelete(const Reference< XPropertySet>& _rxCursorSet) const - { - return ::dbtools::canDelete( _rxCursorSet ); - } - - - Reference< XNameAccess > ODataAccessStaticTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection, - const sal_Int32 _nCommandType, const OUString& _rCommand, - Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) - { - return ::dbtools::getFieldsByCommandDescriptor( _rxConnection, _nCommandType, _rCommand, - _rxKeepFieldsAlive, _pErrorInfo ); - } - - - Sequence< OUString > ODataAccessStaticTools::getFieldNamesByCommandDescriptor( - const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType, - const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) - { - return ::dbtools::getFieldNamesByCommandDescriptor( _rxConnection, _nCommandType, - _rCommand, _pErrorInfo ); - } - - - bool ODataAccessStaticTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection ) - { - return ::dbtools::isEmbeddedInDatabase( _rxComponent, _rxActualConnection ); - } - - -} // namespace connectivity - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx deleted file mode 100644 index ce240b11312e..000000000000 --- a/connectivity/source/simpledbt/staticdbtools_s.hxx +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_STATICDBTOOLS_S_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_STATICDBTOOLS_S_HXX - -#include <connectivity/virtualdbtools.hxx> - - -namespace connectivity -{ - - - - //= ODataAccessStaticTools - - class ODataAccessStaticTools - :public simple::IDataAccessTypeConversion - ,public simple::IDataAccessTools - { - public: - ODataAccessStaticTools(); - - // IDataAccessTypeConversion - - virtual ::com::sun::star::util::Date getStandardDate() const SAL_OVERRIDE; - - - virtual double getValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant, - const ::com::sun::star::util::Date& rNullDate ) const SAL_OVERRIDE; - - - virtual OUString getFormattedValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::util::Date& _rNullDate, - sal_Int32 _nKey, - sal_Int16 _nKeyType) const SAL_OVERRIDE; - - - virtual OUString getFormattedValue( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, - const ::com::sun::star::lang::Locale& _rLocale, - const ::com::sun::star::util::Date& _rNullDate - ) const SAL_OVERRIDE; - - // IDataAccessTools - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( - const OUString& _rDataSourceName, - const OUString& _rUser, - const OUString& _rPwd, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext - ) const SAL_OVERRIDE; - - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, - bool _bSetAsActiveConnection - ) const SAL_OVERRIDE; - - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) - const SAL_OVERRIDE; - - - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, - bool _bAllowDefault - ) const SAL_OVERRIDE; - - - virtual sal_Int32 getDefaultNumberFormat( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _rxTypes, - const ::com::sun::star::lang::Locale& _rLocale - ) const SAL_OVERRIDE; - - - virtual void TransferFormComponentProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew, - const ::com::sun::star::lang::Locale& _rLocale - ) const SAL_OVERRIDE; - - - virtual OUString quoteName( - const OUString& _rQuote, - const OUString& _rName - ) const SAL_OVERRIDE; - - - virtual OUString composeTableNameForSelect( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const OUString& _rCatalog, - const OUString& _rSchema, - const OUString& _rName - ) const SAL_OVERRIDE; - - - virtual OUString composeTableNameForSelect( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable - ) const SAL_OVERRIDE; - - - virtual ::com::sun::star::sdb::SQLContext prependContextInfo( - ::com::sun::star::sdbc::SQLException& _rException, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, - const OUString& _rContextDescription, - const OUString& _rContextDetails - ) const SAL_OVERRIDE; - - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource( - const OUString& _rsRegisteredName, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext - ) const SAL_OVERRIDE; - - - /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT - @param _rxCursorSet the property set - */ - virtual bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE; - - - /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE - @param _rxCursorSet the property set - */ - virtual bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE; - - - /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE - @param _rxCursorSet the property set - */ - virtual bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const SAL_OVERRIDE; - - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > - getFieldsByCommandDescriptor( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const sal_Int32 _nCommandType, - const OUString& _rCommand, - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, - ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_OVERRIDE; - - - virtual ::com::sun::star::uno::Sequence< OUString > - getFieldNamesByCommandDescriptor( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const sal_Int32 _nCommandType, - const OUString& _rCommand, - ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_OVERRIDE; - - - virtual bool isEmbeddedInDatabase( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection - ) SAL_OVERRIDE; - }; - - -} // namespace connectivity - - -#endif // INCLUDED_CONNECTIVITY_SOURCE_SIMPLEDBT_STATICDBTOOLS_S_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index d00ffceea144..a27e420286b5 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -138,7 +138,7 @@ namespace connectivity } // ::cppu::OComponentHelper - virtual void SAL_CALL disposing(void); + virtual void SAL_CALL disposing(); // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire() throw(::com::sun::star::uno::RuntimeException); |