diff options
| author | Noel Grandin <noel@peralex.com> | 2012-12-03 13:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2012-12-10 08:05:31 +0200 |
| commit | d01fba6afc39092ae3ae85c38ac21bb7d26d63e2 (patch) | |
| tree | 7f33e692f5adbe75a2192bf2f573be5be124d604 /connectivity | |
| parent | b8a403467e6209437c3c113ff2df95df6ffec61a (diff) | |
fdo#46808, Adapt sdbc::ConnectionPool UNO service to new style
ConnectionPool was already a new-style service, but since it was
not exposing all of it's interfaces properly I had to create
a unified interface XConnectionPool.
Change-Id: Idfa3fa3335173ceeab1785b4049422874b6c9d5a
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 2 | ||||
| -rw-r--r-- | connectivity/source/cpool/ZPoolCollection.hxx | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index a33e4a47529f..e00d7383c51b 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -417,7 +417,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R else if (!sURL.isEmpty()) { // the row set has no data source, but a connection url set // -> try to connection with that url - Reference< XDriverManager > xDriverManager; + Reference< XConnectionPool > xDriverManager; try { xDriverManager = ConnectionPool::create( _rxContext ); } catch( const Exception& ) { } diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index 4a2394d65f5f..20108fd87b08 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -19,11 +19,10 @@ #ifndef CONNECTIVITY_POOLCOLLECTION_HXX #define CONNECTIVITY_POOLCOLLECTION_HXX -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase4.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> -#include <com/sun/star/sdbc/XDriverManager.hpp> #include <com/sun/star/sdbc/XDriver.hpp> -#include <com/sun/star/sdbc/XDriverAccess.hpp> +#include <com/sun/star/sdbc/XConnectionPool.hpp> #include <com/sun/star/sdbc/XPooledConnection.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -42,8 +41,7 @@ namespace connectivity //= OPoolCollection - the one-instance service for PooledConnections //= manages the active connections and the connections in the pool //========================================================================== - typedef ::cppu::WeakImplHelper5< ::com::sun::star::sdbc::XDriverManager, - ::com::sun::star::sdbc::XDriverAccess, + typedef ::cppu::WeakImplHelper4< ::com::sun::star::sdbc::XConnectionPool, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::frame::XTerminateListener, ::com::sun::star::beans::XPropertyChangeListener |