diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
| commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
| tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /connectivity | |
| parent | 135907f2061550624ee1859745d94eee01849070 (diff) | |
remove unnecessary use of void in function declarations
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'connectivity')
113 files changed, 131 insertions, 131 deletions
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 3f9dfc9c9629..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(); 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/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/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/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 a6ce0a481b4c..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(); 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.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..5c4cfbe520ec 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -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 fd11265acc19..68893053df95 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -137,7 +137,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(); diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 86d882b704b7..cf7e93475569 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -300,7 +300,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/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/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/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/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/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 838eaa88768d..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(); 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/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/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/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/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index d0c74f604c52..4bd102d7ad7b 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -118,7 +118,7 @@ OResultSet::~OResultSet() } -void OResultSet::disposing(void) +void OResultSet::disposing() { OPropertySetHelper::disposing(); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 8e90471d9239..b130610badd2 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -124,7 +124,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/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/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..af47aa9e6f3e 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -117,7 +117,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.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/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/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 a4d019dfaf72..e9e9a3e4462a 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(); diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 426b869c0224..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 ); diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 6ecadf402e87..5df41972f75b 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -98,7 +98,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); 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..f443a545626c 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -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/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/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..15fac9a39440 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -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/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 1bf65b9e9804..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(); 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/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 7828c7e1fe12..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(); diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index b74842c724eb..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); 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); |