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 /connectivity/source/commontools/parameters.cxx | |
| parent | fdo#46808, Adapt reflection::ProxyFactory UNO service to new style (diff) | |
| download | core-38cc919efb965e7982d23d5b1c91a639cc2c6fdd.tar.gz core-38cc919efb965e7982d23d5b1c91a639cc2c6fdd.zip | |
fdo#46808, use service constructor for sdbc::ConnectionPool
Change-Id: Id12226af5e537b1eeacbb062ad937a3551e245c0
Diffstat (limited to 'connectivity/source/commontools/parameters.cxx')
| -rw-r--r-- | connectivity/source/commontools/parameters.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index b082e88adff3..ef83e56ea80c 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -63,15 +63,15 @@ namespace dbtools //= ParameterManager //==================================================================== //-------------------------------------------------------------------- - ParameterManager::ParameterManager( ::osl::Mutex& _rMutex, const Reference< XMultiServiceFactory >& _rxORB ) + ParameterManager::ParameterManager( ::osl::Mutex& _rMutex, const Reference< XComponentContext >& _rxContext ) :m_rMutex ( _rMutex ) ,m_aParameterListeners( _rMutex ) - ,m_xORB ( _rxORB ) + ,m_xContext ( _rxContext ) ,m_pOuterParameters ( NULL ) ,m_nInnerCount ( 0 ) ,m_bUpToDate ( false ) { - OSL_ENSURE( m_xORB.is(), "ParameterManager::ParameterManager: no service factory!" ); + OSL_ENSURE( m_xContext.is(), "ParameterManager::ParameterManager: no service factory!" ); } //-------------------------------------------------------------------- @@ -147,7 +147,7 @@ namespace dbtools try { // get a query composer for the 's settings - m_xComposer.reset( getCurrentSettingsComposer( _rxComponent, m_xORB ), SharedQueryComposer::TakeOwnership ); + m_xComposer.reset( getCurrentSettingsComposer( _rxComponent, m_xContext ), SharedQueryComposer::TakeOwnership ); // see if the composer found parameters Reference< XParametersSupplier > xParamSupp( m_xComposer, UNO_QUERY ); @@ -817,7 +817,7 @@ namespace dbtools // re-create the parent composer all the time. Else, we'd have to bother with // being a listener at its properties, its loaded state, and event the parent-relationship. m_xParentComposer.reset( - getCurrentSettingsComposer( xParent, m_xORB ), + getCurrentSettingsComposer( xParent, m_xContext ), SharedQueryComposer::TakeOwnership ); xParentColSupp = xParentColSupp.query( m_xParentComposer ); |