From 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Sat, 22 Feb 2014 21:20:15 +0100 Subject: Remove unneccessary comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- connectivity/source/cpool/ZConnectionPool.cxx | 34 ++++++------- connectivity/source/cpool/ZConnectionWrapper.cxx | 50 +++++++++--------- connectivity/source/cpool/ZDriverWrapper.cxx | 16 +++--- connectivity/source/cpool/ZPoolCollection.cxx | 64 ++++++++++++------------ connectivity/source/cpool/ZPooledConnection.cxx | 8 +-- connectivity/source/cpool/Zregistration.cxx | 2 +- 6 files changed, 87 insertions(+), 87 deletions(-) (limited to 'connectivity/source/cpool') diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 476106b7606d..869b95e6e5ba 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -50,7 +50,7 @@ void SAL_CALL OPoolTimer::onShot() } namespace { - //-------------------------------------------------------------------- + static const OUString& getTimeoutNodeName() { static OUString s_sNodeName( "Timeout" ); @@ -61,7 +61,7 @@ namespace //========================================================================== //= OConnectionPool //========================================================================== -//-------------------------------------------------------------------------- + OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver, const Reference< XInterface >& _xDriverNode, const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory) @@ -86,12 +86,12 @@ OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver, m_xInvalidator = new OPoolTimer(this,::salhelper::TTimeValue(m_nTimeOut,0)); m_xInvalidator->start(); } -// ----------------------------------------------------------------------------- + OConnectionPool::~OConnectionPool() { clear(sal_False); } -// ----------------------------------------------------------------------------- + struct TRemoveEventListenerFunctor : ::std::unary_function ,::std::unary_function { @@ -104,7 +104,7 @@ struct TRemoveEventListenerFunctor : ::std::unary_function& _xComponent) { Reference< XComponent > xComponent(_xComponent, UNO_QUERY); @@ -116,18 +116,18 @@ struct TRemoveEventListenerFunctor : ::std::unary_functiondispose(); } } - // ----------------------------------------------------------------------------- + void operator()(const TPooledConnections::value_type& _aValue) { dispose(_aValue); } - // ----------------------------------------------------------------------------- + void operator()(const TActiveConnectionMap::value_type& _aValue) { dispose(_aValue.first); } }; -// ----------------------------------------------------------------------------- + struct TConnectionPoolFunctor : ::std::unary_function { OConnectionPool* m_pConnectionPool; @@ -142,7 +142,7 @@ struct TConnectionPoolFunctor : ::std::unary_function SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -187,7 +187,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const return xConnection; } -//-------------------------------------------------------------------------- + void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException) { Reference xConnection(Source.Source,UNO_QUERY); @@ -208,7 +208,7 @@ void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObj m_xDriverNode.clear(); } } -// ----------------------------------------------------------------------------- + Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rURL,const Sequence< PropertyValue >& _rInfo) { // create new pooled conenction @@ -241,7 +241,7 @@ Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rU return xConnection; } -// ----------------------------------------------------------------------------- + void OConnectionPool::invalidatePooledConnections() { MutexGuard aGuard(m_aMutex); @@ -276,7 +276,7 @@ void OConnectionPool::invalidatePooledConnections() if(!m_aPool.empty()) m_xInvalidator->start(); } -// ----------------------------------------------------------------------------- + Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::iterator& _rIter) { Reference xConnection; @@ -299,7 +299,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite } return xConnection; } -// ----------------------------------------------------------------------------- + void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException) { if(getTimeoutNodeName() == evt.PropertyName) @@ -308,7 +308,7 @@ void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) calculateTimeOuts(); } } -// ----------------------------------------------------------------------------- + void OConnectionPool::calculateTimeOuts() { sal_Int32 nTimeOutCorrection = 10; @@ -318,6 +318,6 @@ void OConnectionPool::calculateTimeOuts() m_nTimeOut = m_nALiveCount / nTimeOutCorrection; m_nALiveCount = m_nALiveCount / m_nTimeOut; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index e9cd16616293..98ec50cc2da3 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -26,19 +26,19 @@ #include using namespace connectivity; -//------------------------------------------------------------------------------ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -// -------------------------------------------------------------------------------- + OConnectionWeakWrapper::OConnectionWeakWrapper(Reference< XAggregation >& _xConnection) : OConnectionWeakWrapper_BASE(m_aMutex) { setDelegation(_xConnection,m_refCount); OSL_ENSURE(m_xConnection.is(),"OConnectionWeakWrapper: Connection must be valid!"); } -//----------------------------------------------------------------------------- + OConnectionWeakWrapper::~OConnectionWeakWrapper() { if ( !OConnectionWeakWrapper_BASE::rBHelper.bDisposed ) @@ -48,10 +48,10 @@ OConnectionWeakWrapper::~OConnectionWeakWrapper() } } // XServiceInfo -// -------------------------------------------------------------------------------- + IMPLEMENT_SERVICE_INFO(OConnectionWeakWrapper, "com.sun.star.sdbc.drivers.OConnectionWeakWrapper", "com.sun.star.sdbc.Connection") -// -------------------------------------------------------------------------------- + Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -60,7 +60,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) thr return m_xConnection->createStatement(); } -// -------------------------------------------------------------------------------- + Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -69,7 +69,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen return m_xConnection->prepareStatement(sql); } -// -------------------------------------------------------------------------------- + Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -78,7 +78,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co return m_xConnection->prepareCall(sql); } -// -------------------------------------------------------------------------------- + OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -87,7 +87,7 @@ OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw return m_xConnection->nativeSQL(sql); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -95,7 +95,7 @@ void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw m_xConnection->setAutoCommit(autoCommit); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -104,7 +104,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) throw(SQLException, return m_xConnection->getAutoCommit(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::commit( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -113,7 +113,7 @@ void SAL_CALL OConnectionWeakWrapper::commit( ) throw(SQLException, RuntimeExce m_xConnection->commit(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -122,14 +122,14 @@ void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeEx m_xConnection->rollback(); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xConnection->isClosed(); } -// -------------------------------------------------------------------------------- + Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -138,7 +138,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) return m_xConnection->getMetaData(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -147,7 +147,7 @@ void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQL m_xConnection->setReadOnly(readOnly); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -156,7 +156,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, Run return m_xConnection->isReadOnly(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -165,7 +165,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) thro m_xConnection->setCatalog(catalog); } -// -------------------------------------------------------------------------------- + OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -174,7 +174,7 @@ OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, Run return m_xConnection->getCatalog(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,7 +183,7 @@ void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) m_xConnection->setTransactionIsolation(level); } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQL return m_xConnection->getTransactionIsolation(); } -// -------------------------------------------------------------------------------- + Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnectionWeakWr return m_xConnection->getTypeMap(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -210,7 +210,7 @@ void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< ::com::sun::s m_xConnection->setTypeMap(typeMap); } -// -------------------------------------------------------------------------------- + // XCloseable void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeException) { @@ -221,7 +221,7 @@ void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeExcep } dispose(); } -//------------------------------------------------------------------------------ + void OConnectionWeakWrapper::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -229,7 +229,7 @@ void OConnectionWeakWrapper::disposing() OConnectionWeakWrapper_BASE::disposing(); OConnectionWrapper::disposing(); } -// ----------------------------------------------------------------------------- + // com::sun::star::lang::XUnoTunnel #ifdef N_DEBUG IMPLEMENT_FORWARD_XINTERFACE2(OConnectionWeakWrapper,OConnectionWeakWrapper_BASE,OConnectionWrapper) diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index f039de4934dd..3c3ba05db709 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -33,7 +33,7 @@ namespace connectivity //==================================================================== //= ODriverWrapper //==================================================================== - //-------------------------------------------------------------------- + ODriverWrapper::ODriverWrapper( Reference< XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool ) :m_pConnectionPool(_pPool) { @@ -60,7 +60,7 @@ namespace connectivity osl_atomic_decrement( &m_refCount ); } - //-------------------------------------------------------------------- + ODriverWrapper::~ODriverWrapper() { if (m_xDriverAggregate.is()) @@ -71,14 +71,14 @@ namespace connectivity m_pConnectionPool = NULL; } - //-------------------------------------------------------------------- + Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) throw (RuntimeException) { Any aReturn = ODriverWrapper_BASE::queryInterface(_rType); return aReturn.hasValue() ? aReturn : (m_xDriverAggregate.is() ? m_xDriverAggregate->queryAggregation(_rType) : aReturn); } - //-------------------------------------------------------------------- + Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { Reference< XConnection > xConnection; @@ -91,13 +91,13 @@ namespace connectivity return xConnection; } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException) { return m_xDriver.is() && m_xDriver->acceptsURL(url); } - //-------------------------------------------------------------------- + Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException) { Sequence< DriverPropertyInfo > aInfo; @@ -106,13 +106,13 @@ namespace connectivity return aInfo; } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion( ) throw (RuntimeException) { return m_xDriver.is() ? m_xDriver->getMajorVersion() : 0; } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion( ) throw (RuntimeException) { return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 03eb49e15294..30aa321560db 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -42,38 +42,38 @@ using namespace ::com::sun::star::reflection; using namespace ::osl; using namespace connectivity; -//-------------------------------------------------------------------- + static const OUString& getConnectionPoolNodeName() { static OUString s_sNodeName( "org.openoffice.Office.DataAccess/ConnectionPool" ); return s_sNodeName; } -//-------------------------------------------------------------------- + static const OUString& getEnablePoolingNodeName() { static OUString s_sNodeName( "EnablePooling" ); return s_sNodeName; } -//-------------------------------------------------------------------- + static const OUString& getDriverNameNodeName() { static OUString s_sNodeName( "DriverName" ); return s_sNodeName; } -// ----------------------------------------------------------------------------- + static const OUString& getDriverSettingsNodeName() { static OUString s_sNodeName( "DriverSettings" ); return s_sNodeName; } -//-------------------------------------------------------------------------- + static const OUString& getEnableNodeName() { static OUString s_sNodeName( "Enable" ); return s_sNodeName; } -//-------------------------------------------------------------------- + OPoolCollection::OPoolCollection(const Reference< XComponentContext >& _rxContext) :m_xContext(_rxContext) { @@ -95,17 +95,17 @@ OPoolCollection::OPoolCollection(const Reference< XComponentContext >& _rxContex } osl_atomic_decrement( &m_refCount ); } -// ----------------------------------------------------------------------------- + OPoolCollection::~OPoolCollection() { clearConnectionPools(sal_False); } -// ----------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException) { return getConnectionWithInfo(_rURL,Sequence< PropertyValue >()); } -// ----------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -125,19 +125,19 @@ Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const return xConnection; } -// ----------------------------------------------------------------------------- + void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); m_xManager->setLoginTimeout(seconds); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); return m_xManager->getLoginTimeout(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -149,7 +149,7 @@ sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceNam return cppu::supportsService(this, _rServiceName); } -//-------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); @@ -161,20 +161,20 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference return static_cast(new OPoolCollection(comphelper::getComponentContext(_rxFactory))); } -//-------------------------------------------------------------------------- + OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(RuntimeException) { return OUString("com.sun.star.sdbc.OConnectionPool"); } -//-------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< OUString > aSupported(1); aSupported[0] = "com.sun.star.sdbc.ConnectionPool"; return aSupported; } -// ----------------------------------------------------------------------------- + Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException) { // returns the original driver when no connection pooling is enabled else it returns the proxy @@ -216,7 +216,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _ return xDriver; } -// ----------------------------------------------------------------------------- + sal_Bool OPoolCollection::isDriverPoolingEnabled(const OUString& _sDriverImplName, Reference< XInterface >& _rxDriverNode) { @@ -244,7 +244,7 @@ sal_Bool OPoolCollection::isDriverPoolingEnabled(const OUString& _sDriverImplNam } return bEnabled; } -// ----------------------------------------------------------------------------- + sal_Bool OPoolCollection::isPoolingEnabled() { // the config node where all pooling relevant info are stored under @@ -256,14 +256,14 @@ sal_Bool OPoolCollection::isPoolingEnabled() getNodeValue(getEnablePoolingNodeName(),xConnectionPoolRoot) >>= bEnabled; return bEnabled; } -// ----------------------------------------------------------------------------- + Reference OPoolCollection::getConfigPoolRoot() { if(!m_xConfigNode.is()) m_xConfigNode = createWithServiceFactory(getConnectionPoolNodeName()); return m_xConfigNode; } -// ----------------------------------------------------------------------------- + sal_Bool OPoolCollection::isPoolingEnabledByUrl(const OUString& _sUrl, Reference< XDriver >& _rxDriver, OUString& _rsImplName, @@ -285,7 +285,7 @@ sal_Bool OPoolCollection::isPoolingEnabledByUrl(const OUString& _sUrl, } return bEnabled; } -// ----------------------------------------------------------------------------- + void OPoolCollection::clearConnectionPools(sal_Bool _bDispose) { OConnectionPools::const_iterator aIter = m_aPools.begin(); @@ -298,7 +298,7 @@ void OPoolCollection::clearConnectionPools(sal_Bool _bDispose) m_aPools.erase(sKeyValue); } } -// ----------------------------------------------------------------------------- + OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, const Reference< XDriver >& _xDriver, const Reference< XInterface >& _xDriverNode) @@ -322,14 +322,14 @@ OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName, return pRet; } -// ----------------------------------------------------------------------------- + Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const { return createWithProvider( com::sun::star::configuration::theDefaultProvider::get(m_xContext), _rPath); } -//------------------------------------------------------------------------ + Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath) const { @@ -348,7 +348,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu "::createWithProvider: could not create the node access!"); return xInterface; } -// ----------------------------------------------------------------------------- + Reference OPoolCollection::openNode(const OUString& _rPath,const Reference& _xTreeNode) const throw() { Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY); @@ -380,7 +380,7 @@ Reference OPoolCollection::openNode(const OUString& _rPath,const Ref } return xNode; } -// ----------------------------------------------------------------------------- + Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference& _xTreeNode) throw() { Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY); @@ -405,16 +405,16 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const ReferenceremoveTerminateListener(this); m_xDesktop.clear(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index a50d6da70ffc..93469c7a481f 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -42,7 +42,7 @@ OPooledConnection::OPooledConnection(const Reference< XConnection >& _xConnectio { } -// ----------------------------------------------------------------------------- + // OComponentHelper void SAL_CALL OPooledConnection::disposing(void) { @@ -52,13 +52,13 @@ void SAL_CALL OPooledConnection::disposing(void) m_xComponent.clear(); ::comphelper::disposeComponent(m_xRealConnection); } -// ----------------------------------------------------------------------------- + // XEventListener void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) { m_xComponent.clear(); } -// ----------------------------------------------------------------------------- + //XPooledConnection Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, RuntimeException) { @@ -72,6 +72,6 @@ Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, } return Reference< XConnection >(m_xComponent,UNO_QUERY); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index 3d3d657d272a..880190ee9b96 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -33,7 +33,7 @@ using namespace connectivity; extern "C" { -//--------------------------------------------------------------------------------------- + SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbpool2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; -- cgit