diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-27 11:45:21 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-28 13:06:18 +0100 |
| commit | 38cc919efb965e7982d23d5b1c91a639cc2c6fdd (patch) | |
| tree | 3586b24e5d14c7612dae8da02cdd04ad7b2ec112 /svx | |
| parent | 7470cc532fe408dc9d8735cde0e2eb5bb62fd69c (diff) | |
fdo#46808, use service constructor for sdbc::ConnectionPool
Change-Id: Id12226af5e537b1eeacbb062ad937a3551e245c0
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/dbtoolsclient.hxx | 2 | ||||
| -rw-r--r-- | svx/source/form/dbtoolsclient.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/tabwin.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 24b9976fccc1..501bc1552655 100644 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -107,7 +107,7 @@ namespace svxform // ------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext, sal_Bool _bSetAsActiveConnection ) const SAL_THROW ( ( ::com::sun::star::sdbc::SQLException , ::com::sun::star::lang::WrappedTargetException diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index 872afb51d79e..aab897135bb1 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -210,12 +210,12 @@ namespace svxform //-------------------------------------------------------------------- Reference< XConnection > OStaticDataAccessTools::connectRowset( const Reference< XRowSet >& _rxRowSet, - const Reference< XMultiServiceFactory >& _rxFactory, sal_Bool _bSetAsActiveConnection ) const + const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection ) const SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) ) { Reference< XConnection > xReturn; if ( ensureLoaded() ) - xReturn = m_xDataAccessTools->connectRowset( _rxRowSet, _rxFactory, _bSetAsActiveConnection ); + xReturn = m_xDataAccessTools->connectRowset( _rxRowSet, _rxContext, _bSetAsActiveConnection ); return xReturn; } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 1b8efb052600..7be58df51c18 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -352,7 +352,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su // get the connection of the form OStaticDataAccessTools aTools; m_aConnection.reset( - aTools.connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessServiceFactory(), sal_True ), + aTools.connectRowset( Reference< XRowSet >( xForm, UNO_QUERY ), ::comphelper::getProcessComponentContext(), sal_True ), SharedConnection::NoTakeOwnership ); // TODO: When incompatible changes (such as extending the "virtualdbtools" interface by ensureRowSetConnection) |