diff options
| author | Noel Grandin <noel@peralex.com> | 2012-11-08 08:16:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-30 13:59:47 +0100 |
| commit | 2cf0f6ea36e1525193544258eef2828a54345510 (patch) | |
| tree | b1033cc7f7ef1061bc16baa8a52480ced38e8b55 /ucb/source/cacher/cachedcontentresultset.cxx | |
| parent | 48f2b7a7af3d4e9bf1b3c27e9aa5e12e60878051 (diff) | |
fdo#46808, use service constructor for ucb::CachedDynamicResultSetStubFactory
Change-Id: Iea7b21621c5d341468976507684a9c01f0822034
Diffstat (limited to 'ucb/source/cacher/cachedcontentresultset.cxx')
| -rw-r--r-- | ucb/source/cacher/cachedcontentresultset.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 5f04be9eae1e..e8adb8b2b98c 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -647,13 +647,13 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo //-------------------------------------------------------------------------- CachedContentResultSet::CachedContentResultSet( - const Reference< XMultiServiceFactory > & xSMgr + const Reference< XComponentContext > & rxContext , const Reference< XResultSet > & xOrigin , const Reference< XContentIdentifierMapping > & xContentIdentifierMapping ) : ContentResultSetWrapper( xOrigin ) - , m_xSMgr( xSMgr ) + , m_xContext( rxContext ) , m_xFetchProvider( NULL ) , m_xFetchProviderForContentAccess( NULL ) @@ -2140,7 +2140,7 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() if ( !m_bTriedToGetTypeConverter && !m_xTypeConverter.is() ) { m_bTriedToGetTypeConverter = sal_True; - m_xTypeConverter = Reference< XTypeConverter >( Converter::create(comphelper::getComponentContext(m_xSMgr)) ); + m_xTypeConverter = Reference< XTypeConverter >( Converter::create(m_xContext) ); OSL_ENSURE( m_xTypeConverter.is(), "PropertyValueSet::getTypeConverter() - " @@ -2156,9 +2156,9 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() //-------------------------------------------------------------------------- CachedContentResultSetFactory::CachedContentResultSetFactory( - const Reference< XMultiServiceFactory > & rSMgr ) + const Reference< XComponentContext > & rxContext ) { - m_xSMgr = rSMgr; + m_xContext = rxContext; } CachedContentResultSetFactory::~CachedContentResultSetFactory() @@ -2187,7 +2187,7 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory, // CachedContentResultSetFactory XServiceInfo methods. //-------------------------------------------------------------------------- -XSERVICEINFO_IMPL_1( CachedContentResultSetFactory, +XSERVICEINFO_IMPL_1_CTX( CachedContentResultSetFactory, OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ), OUString( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) ); @@ -2209,7 +2209,7 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory throw( com::sun::star::uno::RuntimeException ) { Reference< XResultSet > xRet; - xRet = new CachedContentResultSet( m_xSMgr, xSource, xMapping ); + xRet = new CachedContentResultSet( m_xContext, xSource, xMapping ); return xRet; } |