diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2015-05-15 13:27:19 +0200 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-05-15 17:55:15 +0000 |
commit | 5b1337f7b2e1f79d78d4bf6559bd84f1ebb934bf (patch) | |
tree | 82704da8367f25963d08c570a4fa57e30e4ca839 /connectivity/source/cpool | |
parent | 6fbda0905d4e721392038bfad9e173e180f788ee (diff) |
tdf#62475: partial handmade fixes
Change-Id: Ib9af202c43b916b9af4b4e18db35d470a8692fe4
Reviewed-on: https://gerrit.libreoffice.org/15712
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'connectivity/source/cpool')
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.cxx | 6 | ||||
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/cpool/ZConnectionWrapper.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/cpool/ZDriverWrapper.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/cpool/ZDriverWrapper.hxx | 2 | ||||
-rw-r--r-- | connectivity/source/cpool/ZPoolCollection.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/cpool/ZPooledConnection.hxx | 4 | ||||
-rw-r--r-- | connectivity/source/cpool/Zregistration.cxx | 2 |
8 files changed, 8 insertions, 22 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 6c4b8ed7ea32..149d20bb64cb 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -41,9 +41,6 @@ using namespace connectivity; #include <algorithm> - -//= OPoolTimer - void SAL_CALL OPoolTimer::onShot() { m_pPool->invalidatePooledConnections(); @@ -51,9 +48,6 @@ void SAL_CALL OPoolTimer::onShot() static const char TIMEOUT_NODENAME[] = "Timeout"; -//= OConnectionPool - - OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver, const Reference< XInterface >& _xDriverNode, const Reference< ::com::sun::star::reflection::XProxyFactory >& _rxProxyFactory) diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 8f89338b8dc5..d8b3c41c0d07 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -56,8 +56,8 @@ namespace connectivity }; - //= OConnectionPool - the one-instance service for PooledConnections - //= manages the active connections and the connections in the pool + // OConnectionPool - the one-instance service for PooledConnections + // manages the active connections and the connections in the pool typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> OConnectionPool_Base; diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index 29b7a04cb106..7905455cc0bb 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -30,8 +30,8 @@ namespace connectivity { - //= OConnectionWeakWrapper - wraps all methods to the real connection from the driver - //= but when disposed it doesn't dispose the real connection + // OConnectionWeakWrapper - wraps all methods to the real connection from the driver + // but when disposed it doesn't dispose the real connection typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection > OConnectionWeakWrapper_BASE; diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index 888382146f5b..d4defb5d8db9 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -30,10 +30,6 @@ namespace connectivity using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::beans; - - //= ODriverWrapper - - ODriverWrapper::ODriverWrapper( Reference< XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool ) :m_pConnectionPool(_pPool) { diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 01a95a0c6115..7cf98f6bd953 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -32,8 +32,6 @@ namespace connectivity class OConnectionPool; - //= ODriverWrapper - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdbc::XDriver > ODriverWrapper_BASE; diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 22521c977559..94594ec5a526 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -44,8 +44,8 @@ namespace connectivity { class OConnectionPool; - //= OPoolCollection - the one-instance service for PooledConnections - //= manages the active connections and the connections in the pool + // OPoolCollection - the one-instance service for PooledConnections + // manages the active connections and the connections in the pool typedef ::cppu::WeakImplHelper4< ::com::sun::star::sdbc::XConnectionPool, ::com::sun::star::lang::XServiceInfo, diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index 26dba7b32faf..92d49d956d98 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -29,8 +29,8 @@ namespace connectivity { - //= OPooledConnection - - //= allows to pool a real connection + // OPooledConnection - + // allows to pool a real connection typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XPooledConnection ,::com::sun::star::lang::XEventListener> OPooledConnection_Base; diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index 8367c970ed0f..2dc50e9d85f4 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -28,8 +28,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; using namespace connectivity; -//= registration - extern "C" { |