diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 17:59:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-27 06:54:35 -0600 |
| commit | ac9212feedb828064c5cf5cbb0bde8f02cc93d65 (patch) | |
| tree | e429c2bbcdfe7a98c2d55433e752bfecac3d5d00 /connectivity/source/manager | |
| parent | 2a33953f6eb5da62042ea3731ef9d61666d5556f (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/manager')
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.cxx | 18 | ||||
| -rw-r--r-- | connectivity/source/manager/mdrivermanager.hxx | 8 | ||||
| -rw-r--r-- | connectivity/source/manager/mregistration.cxx | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 01cbaad47206..261057467fa2 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -58,9 +58,9 @@ void throwNoSuchElementException() throw(NoSuchElementException) throw NoSuchElementException(); } -//========================================================================== + //= ODriverEnumeration -//========================================================================== + class ODriverEnumeration : public ::cppu::WeakImplHelper1< XEnumeration > { friend class OSDBCDriverManager; @@ -107,9 +107,9 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W return makeAny( *m_aPos++ ); } - //===================================================================== + //= helper - //===================================================================== + /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess > @@ -167,7 +167,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W // ctor AcceptsURL( const OUString& _rURL ) : m_rURL( _rURL ) { } - //................................................................. + bool operator()( const Reference<XDriver>& _rDriver ) const { // ask the driver @@ -224,7 +224,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W /// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names struct CompareDriverAccessByName : public ::std::binary_function< DriverAccess, DriverAccess, bool > { - //................................................................. + bool operator()( const DriverAccess& lhs, const DriverAccess& rhs ) { return lhs.sImplementationName < rhs.sImplementationName ? true : false; @@ -236,16 +236,16 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) throw(NoSuchElementException, W { OUString m_sImplName; EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){} - //................................................................. + bool operator()( const DriverAccess& lhs) { return lhs.sImplementationName.equals(m_sImplName); } }; -//========================================================================== + //= OSDBCDriverManager -//========================================================================== + OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext ) :m_xContext( _rxContext ) diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 7e7c1129a74e..27373ba9c672 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -41,9 +41,9 @@ namespace drivermanager { - //====================================================================== + //= various - //====================================================================== + typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > DriverCollection; struct DriverAccess @@ -53,9 +53,9 @@ namespace drivermanager css::uno::Reference< css::lang::XSingleComponentFactory > xComponentFactory; /// the factory to create the driver component (if not already done so) }; - //========================================================================== + //= OSDBCDriverManager - the one-instance service for managing SDBC drivers - //========================================================================== + typedef ::cppu::WeakImplHelper3 < ::com::sun::star::sdbc::XDriverManager2 , ::com::sun::star::lang::XServiceInfo , ::com::sun::star::uno::XNamingService diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx index 745ce6efb551..45eff1864774 100644 --- a/connectivity/source/manager/mregistration.cxx +++ b/connectivity/source/manager/mregistration.cxx @@ -27,9 +27,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -//========================================================================== + //= registration -//========================================================================== + extern "C" { |