diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-27 11:00:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-28 13:06:18 +0100 |
| commit | 7470cc532fe408dc9d8735cde0e2eb5bb62fd69c (patch) | |
| tree | 3815c10cbd2473a19915d8057ca1eb19046592bc /connectivity/source/drivers/hsqldb | |
| parent | 56ea15091c69d280310aa8b28bb1e9488eaad756 (diff) | |
fdo#46808, Adapt reflection::ProxyFactory UNO service to new style
The service is deprecated, but we still have a handful of in-tree
users, and converting it lets me thread XComponentContext through
a bunch of classes.
Change-Id: Iffdfe537ada6b9e4a89f9b3c8dd82ca85f4bfaba
Diffstat (limited to 'connectivity/source/drivers/hsqldb')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HConnection.cxx | 11 | ||||
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 2d447af76467..2b1f9c0464a0 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -53,6 +53,7 @@ using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; +using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::sdbc::XStatement; using ::com::sun::star::sdbc::XConnection; using ::com::sun::star::sdbcx::XDataDefinitionSupplier; @@ -118,15 +119,15 @@ namespace connectivity { namespace hsqldb } // ----------------------------------------------------------------------------- OHsqlConnection::OHsqlConnection( const Reference< XDriver > _rxDriver, - const Reference< XConnection >& _xConnection ,const Reference< XMultiServiceFactory>& _xORB ) + const Reference< XConnection >& _xConnection ,const Reference< XComponentContext >& _rxContext ) :OHsqlConnection_BASE( m_aMutex ) ,m_aFlushListeners( m_aMutex ) ,m_xDriver( _rxDriver ) - ,m_xORB( _xORB ) + ,m_xContext( _rxContext ) ,m_bIni(true) ,m_bReadOnly(false) { - setDelegation(_xConnection,_xORB,m_refCount); + setDelegation(_xConnection,_rxContext,m_refCount); } // ----------------------------------------------------------------------------- OHsqlConnection::~OHsqlConnection() @@ -343,8 +344,8 @@ namespace connectivity { namespace hsqldb { // create a graphic provider Reference< XGraphicProvider > xProvider; - if ( m_xORB.is() ) - xProvider.set( GraphicProvider::create(::comphelper::getComponentContext(m_xORB)) ); + if ( m_xContext.is() ) + xProvider.set( GraphicProvider::create(m_xContext) ); // assemble the image URL ::rtl::OUStringBuffer aImageURL; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 114c4402d9d5..471d67bd5fbf 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -381,7 +381,7 @@ namespace connectivity xDesktop->addTerminateListener(s_xTerminateListener); } } - Reference< XComponent> xIfc = new OHsqlConnection( this, xOrig, m_xFactory ); + Reference< XComponent> xIfc = new OHsqlConnection( this, xOrig, comphelper::getComponentContext(m_xFactory) ); xConnection.set(xIfc,UNO_QUERY); m_aConnections.push_back(TWeakPair(WeakReferenceHelper(xOrig),TWeakConnectionPair(sKey,TWeakRefPair(WeakReferenceHelper(xConnection),WeakReferenceHelper())))); |