fdo#46808, use service constructor for ucb::CachedDynamicResultSetStubFactory

Change-Id: Iea7b21621c5d341468976507684a9c01f0822034

7 files changed, 37 insertions, 40 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;
 }
 
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 01925d6df0f6..1f15bc5017a7 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -113,8 +113,8 @@ class CachedContentResultSet
     //-----------------------------------------------------------------
     //members
 
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-                            m_xSMgr;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+                            m_xContext;
 
     //different Interfaces from Origin:
     com::sun::star::uno::Reference< com::sun::star::ucb::XFetchProvider >
@@ -188,8 +188,8 @@ private:
 public:
     CachedContentResultSet(
                         const com::sun::star::uno::Reference<
-                            com::sun::star::lang::XMultiServiceFactory > &
-                                xSMgr,
+                            com::sun::star::uno::XComponentContext > &
+                                rxContext,
                         const com::sun::star::uno::Reference<
                             com::sun::star::sdbc::XResultSet > & xOrigin,
                         const com::sun::star::uno::Reference<
@@ -474,13 +474,13 @@ class CachedContentResultSetFactory
 {
 protected:
     com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory >    m_xSMgr;
+        com::sun::star::uno::XComponentContext >    m_xContext;
 
 public:
 
     CachedContentResultSetFactory(
         const com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory > & rSMgr);
+        com::sun::star::uno::XComponentContext > & rxContext);
 
     virtual ~CachedContentResultSetFactory();
 
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index f6594f817755..fef33a44e682 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <cachedcontentresultset.hxx>
 #include <osl/diagnose.h>
+#include <comphelper/processfactory.hxx>
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
@@ -34,7 +35,7 @@ CachedDynamicResultSet::CachedDynamicResultSet(
         Reference< XDynamicResultSet > xOrigin
         , const Reference< XContentIdentifierMapping > & xContentMapping
         , const Reference< XMultiServiceFactory > & xSMgr )
-        : DynamicResultSetWrapper( xOrigin, xSMgr )
+        : DynamicResultSetWrapper( xOrigin, comphelper::getComponentContext(xSMgr) )
         , m_xContentIdentifierMapping( xContentMapping )
 {
     impl_init();
@@ -53,7 +54,7 @@ void SAL_CALL CachedDynamicResultSet
     OSL_ENSURE( m_xSourceResultOne.is(), "need source resultset" );
 
     Reference< XResultSet > xCache(
-        new CachedContentResultSet( m_xSMgr, m_xSourceResultOne, m_xContentIdentifierMapping ) );
+        new CachedContentResultSet( m_xContext, m_xSourceResultOne, m_xContentIdentifierMapping ) );
 
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_xMyResultOne = xCache;
@@ -67,7 +68,7 @@ void SAL_CALL CachedDynamicResultSet
     OSL_ENSURE( m_xSourceResultTwo.is(), "need source resultset" );
 
     Reference< XResultSet > xCache(
-        new CachedContentResultSet( m_xSMgr, m_xSourceResultTwo, m_xContentIdentifierMapping ) );
+        new CachedContentResultSet( m_xContext, m_xSourceResultTwo, m_xContentIdentifierMapping ) );
 
     osl::Guard< osl::Mutex > aGuard( m_aMutex );
     m_xMyResultTwo = xCache;
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index 9f83f3b144a5..4581c6838a98 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -35,10 +35,10 @@ using ::rtl::OUString;
 
 CachedDynamicResultSetStub::CachedDynamicResultSetStub(
         Reference< XDynamicResultSet > xOrigin
-        , const Reference< XMultiServiceFactory > & xSMgr )
-        : DynamicResultSetWrapper( xOrigin, xSMgr )
+        , const Reference< XComponentContext > & rxContext )
+        : DynamicResultSetWrapper( xOrigin, rxContext )
 {
-    OSL_ENSURE( m_xSMgr.is(), "need Multiservicefactory to create stub" );
+    OSL_ENSURE( m_xContext.is(), "need Multiservicefactory to create stub" );
     impl_init();
 }
 
@@ -124,9 +124,9 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
 //--------------------------------------------------------------------------
 
 CachedDynamicResultSetStubFactory::CachedDynamicResultSetStubFactory(
-        const Reference< XMultiServiceFactory > & rSMgr )
+        const Reference< XComponentContext > & rxContext )
 {
-    m_xSMgr = rSMgr;
+    m_xContext = rxContext;
 }
 
 CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory()
@@ -155,7 +155,7 @@ XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
 // CachedDynamicResultSetStubFactory XServiceInfo methods.
 //--------------------------------------------------------------------------
 
-XSERVICEINFO_IMPL_1( CachedDynamicResultSetStubFactory,
+XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetStubFactory,
                      OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
                      OUString( CACHED_DRS_STUB_FACTORY_NAME ) );
 
@@ -176,7 +176,7 @@ Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory
             throw( RuntimeException )
 {
     Reference< XDynamicResultSet > xRet;
-    xRet = new CachedDynamicResultSetStub( Source, m_xSMgr );
+    xRet = new CachedDynamicResultSetStub( Source, m_xContext );
     return xRet;
 }
 
@@ -203,7 +203,7 @@ void SAL_CALL CachedDynamicResultSetStubFactory
         Reference< XSortedDynamicResultSetFactory > xSortFactory;
         try
         {
-            xSortFactory = SortedDynamicResultSetFactory::create( comphelper::getComponentContext(m_xSMgr) );
+            xSortFactory = SortedDynamicResultSetFactory::create( m_xContext );
         }
         catch ( Exception const & )
         {
@@ -220,7 +220,7 @@ void SAL_CALL CachedDynamicResultSetStubFactory
     }
 
     Reference< XDynamicResultSet > xStub(
-        new CachedDynamicResultSetStub( xSource, m_xSMgr ) );
+        new CachedDynamicResultSetStub( xSource, m_xContext ) );
 
     Reference< XSourceInitialization > xTarget( TargetCache, UNO_QUERY );
     OSL_ENSURE( xTarget.is(), "Target must have interface XSourceInitialization" );
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index f46d734db183..a65d836662bf 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -45,7 +45,7 @@ public:
     CachedDynamicResultSetStub( com::sun::star::uno::Reference<
                         com::sun::star::ucb::XDynamicResultSet > xOrigin
         , const com::sun::star::uno::Reference<
-                        com::sun::star::lang::XMultiServiceFactory > & xSMgr );
+                        com::sun::star::uno::XComponentContext > & rxContext );
 
     virtual ~CachedDynamicResultSetStub();
 
@@ -74,13 +74,13 @@ class CachedDynamicResultSetStubFactory
 {
 protected:
     com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory >    m_xSMgr;
+        com::sun::star::uno::XComponentContext >    m_xContext;
 
 public:
 
     CachedDynamicResultSetStubFactory(
         const com::sun::star::uno::Reference<
-        com::sun::star::lang::XMultiServiceFactory > & rSMgr);
+        com::sun::star::uno::XComponentContext > & rxContext);
 
     virtual ~CachedDynamicResultSetStubFactory();
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index 5c098b3417a5..30a2b1f8ff79 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -24,7 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/ucb/ListActionType.hpp>
 #include <com/sun/star/ucb/WelcomeDynamicResultSetStruct.hpp>
-#include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.hpp>
+#include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp>
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
@@ -42,12 +42,12 @@ using ::rtl::OUString;
 
 DynamicResultSetWrapper::DynamicResultSetWrapper(
                     Reference< XDynamicResultSet > xOrigin
-                    , const Reference< XMultiServiceFactory > & xSMgr )
+                    , const Reference< XComponentContext > & rxContext )
 
                 : m_bDisposed( sal_False )
                 , m_bInDispose( sal_False )
                 , m_pDisposeEventListeners( NULL )
-                , m_xSMgr( xSMgr )
+                , m_xContext( rxContext )
                 , m_bStatic( sal_False )
                 , m_bGotWelcome( sal_False )
                 , m_xSource( xOrigin )
@@ -409,18 +409,14 @@ void SAL_CALL DynamicResultSetWrapper
 
     Reference< XSourceInitialization > xTarget( xCache, UNO_QUERY );
     OSL_ENSURE( xTarget.is(), "The given Target dosn't have the required interface 'XSourceInitialization'" );
-    if( xTarget.is() && m_xSMgr.is() )
+    if( xTarget.is() && m_xContext.is() )
     {
         //@todo m_aSourceSet.wait();?
 
         Reference< XCachedDynamicResultSetStubFactory > xStubFactory;
         try
         {
-            xStubFactory = Reference< XCachedDynamicResultSetStubFactory >(
-                m_xSMgr->createInstance(
-                    OUString(RTL_CONSTASCII_USTRINGPARAM(
-                        "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
-                UNO_QUERY );
+            xStubFactory = CachedDynamicResultSetStubFactory::create( m_xContext );
         }
         catch ( Exception const & )
         {
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index ae12dfe241e4..8c7c6e616954 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -57,8 +57,8 @@ protected:
     DynamicResultSetWrapperListener*
                             m_pMyListenerImpl;
 
-    com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
-                            m_xSMgr;
+    com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+                            m_xContext;
 
     osl::Mutex              m_aMutex;
     sal_Bool                m_bStatic;
@@ -107,7 +107,7 @@ public:
         com::sun::star::uno::Reference<
                         com::sun::star::ucb::XDynamicResultSet > xOrigin
         , const com::sun::star::uno::Reference<
-                        com::sun::star::lang::XMultiServiceFactory > & xSMgr );
+                        com::sun::star::uno::XComponentContext > & rxContext );
 
     virtual ~DynamicResultSetWrapper();