summaryrefslogtreecommitdiff
path: root/connectivity/source/cpool
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 17:59:09 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-27 06:54:35 -0600
commitac9212feedb828064c5cf5cbb0bde8f02cc93d65 (patch)
treee429c2bbcdfe7a98c2d55433e752bfecac3d5d00 /connectivity/source/cpool
parent2a33953f6eb5da62042ea3731ef9d61666d5556f (diff)
Remove visual noise from connectivity
Conflicts: connectivity/source/inc/odbc/OConnection.hxx Change-Id: I5ca98359e18cf1b27bf53037dde211774d798626 Reviewed-on: https://gerrit.libreoffice.org/8245 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'connectivity/source/cpool')
-rw-r--r--connectivity/source/cpool/ZConnectionPool.cxx8
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx8
-rw-r--r--connectivity/source/cpool/ZConnectionWrapper.hxx4
-rw-r--r--connectivity/source/cpool/ZDriverWrapper.cxx12
-rw-r--r--connectivity/source/cpool/ZDriverWrapper.hxx12
-rw-r--r--connectivity/source/cpool/ZPoolCollection.hxx6
-rw-r--r--connectivity/source/cpool/ZPooledConnection.hxx4
-rw-r--r--connectivity/source/cpool/Zregistration.cxx4
8 files changed, 29 insertions, 29 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 0a316c2b6802..fc289fbccee8 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -41,9 +41,9 @@ using namespace connectivity;
#include <algorithm>
-//==========================================================================
+
//= OPoolTimer
-//==========================================================================
+
void SAL_CALL OPoolTimer::onShot()
{
m_pPool->invalidatePooledConnections();
@@ -58,9 +58,9 @@ namespace
}
}
-//==========================================================================
+
//= OConnectionPool
-//==========================================================================
+
OConnectionPool::OConnectionPool(const Reference< XDriver >& _xDriver,
const Reference< XInterface >& _xDriverNode,
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index becc07e5d960..6d2f155ef217 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -40,9 +40,9 @@
namespace connectivity
{
class OConnectionPool;
- //==========================================================================
+
/// OPoolTimer - Invalidates the connection pool
- //==========================================================================
+
class OPoolTimer : public ::salhelper::Timer
{
OConnectionPool* m_pPool;
@@ -55,10 +55,10 @@ namespace connectivity
virtual void SAL_CALL onShot();
};
- //==========================================================================
+
//= 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;
// typedef for the interanl structure
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index 886b671ee3e7..ed10d63c666d 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -29,10 +29,10 @@
namespace connectivity
{
- //==========================================================================
+
//= 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 6d8a49777fe1..888382146f5b 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -21,18 +21,18 @@
#include "ZConnectionPool.hxx"
#include <osl/diagnose.h>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::beans;
- //====================================================================
+
//= ODriverWrapper
- //====================================================================
+
ODriverWrapper::ODriverWrapper( Reference< XAggregation >& _rxAggregateDriver, OConnectionPool* _pPool )
:m_pConnectionPool(_pPool)
@@ -118,9 +118,9 @@ namespace connectivity
return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0;
}
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 21eef7405e43..48745961c861 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -25,15 +25,15 @@
#include <osl/mutex.hxx>
#include <com/sun/star/uno/XAggregation.hpp>
-//........................................................................
+
namespace connectivity
{
-//........................................................................
+
class OConnectionPool;
- //====================================================================
+
//= ODriverWrapper
- //====================================================================
+
typedef ::cppu::WeakImplHelper1 < ::com::sun::star::sdbc::XDriver
> ODriverWrapper_BASE;
@@ -72,9 +72,9 @@ namespace connectivity
virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (::com::sun::star::uno::RuntimeException, std::exception);
};
-//........................................................................
+
} // namespace connectivity
-//........................................................................
+
#endif // _CONNECTIVITY_CPOOL_ZDRIVERWRAPPER_HXX_
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index 04ede1041fde..767241e2b052 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -43,10 +43,10 @@
namespace connectivity
{
class OConnectionPool;
- //==========================================================================
+
//= 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,
::com::sun::star::frame::XTerminateListener,
@@ -57,7 +57,7 @@ namespace connectivity
class OPoolCollection : public OPoolCollection_Base
{
- //==========================================================================
+
typedef ::comphelper::OInterfaceCompare< ::com::sun::star::sdbc::XDriver > ODriverCompare;
typedef std::map<OUString, OConnectionPool*> OConnectionPools;
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index b587f5bbaea1..72f9d5f5f30c 100644
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
@@ -28,10 +28,10 @@
namespace connectivity
{
- //==========================================================================
+
//= 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 880190ee9b96..c10ce441ccce 100644
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -27,9 +27,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
using namespace connectivity;
-//==========================================================================
+
//= registration
-//==========================================================================
+
extern "C"
{